From 54b11c9c8422754a25c2cc7e3f798d3f47b8ece8 Mon Sep 17 00:00:00 2001
From: Tyrone CT <chongtao@yeah.net>
Date: Mon, 16 Mar 2026 10:36:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GroupLine.App/App.config                      |   31 +
 GroupLine.App/App.xaml                        |   22 +
 GroupLine.App/App.xaml.cs                     |   25 +
 GroupLine.App/Assets/TextBox.xaml             |  104 +
 GroupLine.App/FSqlContext.cs                  |   12 +
 GroupLine.App/GroupLine.App.csproj            |  782 ++++
 GroupLine.App/Images/P0.ico                   |  Bin 0 -> 67646 bytes
 GroupLine.App/Images/logo.png                 |  Bin 0 -> 5629 bytes
 GroupLine.App/MainWindow.xaml                 |   74 +
 GroupLine.App/MainWindow.xaml.cs              |  254 ++
 GroupLine.App/ModelDto/AppearanceTestDto.cs   |  223 +
 GroupLine.App/ModelDto/BurPlugInstallDto.cs   |  130 +
 GroupLine.App/ModelDto/ComboBoxModel.cs       |   30 +
 GroupLine.App/ModelDto/CylinderEngravDto.cs   |   50 +
 GroupLine.App/ModelDto/ExhInstallMesDto.cs    |  340 ++
 GroupLine.App/ModelDto/GCDTransplantDto.cs    |   41 +
 GroupLine.App/ModelDto/GCylinderBurnEbDto.cs  |   77 +
 GroupLine.App/ModelDto/GDynStaticMachDto.cs   |   95 +
 GroupLine.App/ModelDto/GInsRotaResDto.cs      |  107 +
 GroupLine.App/ModelDto/GLeakCheckDto.cs       |   77 +
 GroupLine.App/ModelDto/GLowVolStartDto.cs     |   87 +
 GroupLine.App/ModelDto/GMagTorqueDto.cs       |   68 +
 GroupLine.App/ModelDto/GOilPumpInstallDto.cs  |  140 +
 GroupLine.App/ModelDto/GRingWeldMachDto.cs    |  131 +
 GroupLine.App/ModelDto/GRotorBurnEbDto.cs     |   59 +
 GroupLine.App/ModelDto/GRotorMagDto.cs        |   86 +
 GroupLine.App/ModelDto/GShrinkTubDto.cs       |   77 +
 GroupLine.App/ModelDto/GSpotWeldMachDto.cs    |  275 ++
 GroupLine.App/ModelDto/GStaticDiskMachDto.cs  |  332 ++
 GroupLine.App/ModelDto/KPCDTransplantDto.cs   |   41 +
 GroupLine.App/ModelDto/KPDynStaticMachDto.cs  |  137 +
 GroupLine.App/ModelDto/KPLeakCheckDto.cs      |   77 +
 GroupLine.App/ModelDto/KPLowVolStartDto.cs    |   86 +
 GroupLine.App/ModelDto/KPMagTorqueDto.cs      |   68 +
 GroupLine.App/ModelDto/KPOilPumpInstallDto.cs |  140 +
 GroupLine.App/ModelDto/KPRingWeldMachDto.cs   |  131 +
 GroupLine.App/ModelDto/KPRingWeldMachDwDto.cs |  134 +
 GroupLine.App/ModelDto/KPRingWeldMachUpDto.cs |  133 +
 GroupLine.App/ModelDto/KPSealInstallDto.cs    |  311 ++
 GroupLine.App/ModelDto/KPShrinkTubDto.cs      |   79 +
 GroupLine.App/ModelDto/KPSpotWeldMachDto.cs   |  221 +
 GroupLine.App/ModelDto/KPStaticDiskMachDto.cs |  332 ++
 GroupLine.App/ModelDto/KPUpBurnEbDto.cs       |   82 +
 GroupLine.App/ModelDto/KanBan/PlanCountDto.cs |   97 +
 GroupLine.App/ModelDto/KanBan/WorkTimeDto.cs  |   86 +
 GroupLine.App/ModelDto/MagTorqueDto.cs        |   70 +
 GroupLine.App/ModelDto/OilPumpInstallDto.cs   |   88 +
 GroupLine.App/ModelDto/OverflowLeakMesDto.cs  |  191 +
 GroupLine.App/ModelDto/PCoreMesDto.cs         |   59 +
 GroupLine.App/ModelDto/PLowWeldDto.cs         |  113 +
 GroupLine.App/ModelDto/PRacktPressDto.cs      |   77 +
 GroupLine.App/ModelDto/PRacktWeldDto.cs       |   59 +
 GroupLine.App/ModelDto/StaticDiscPressDto.cs  |  100 +
 GroupLine.App/ModelDto/TermWeldDto.cs         |  102 +
 GroupLine.App/ModelDto/ValidateModelBase.cs   |   90 +
 GroupLine.App/NLog.config                     |   48 +
 GroupLine.App/NLog.xsd                        | 3728 +++++++++++++++++
 GroupLine.App/Properties/AssemblyInfo.cs      |   53 +
 .../Properties/Resources.Designer.cs          |   63 +
 GroupLine.App/Properties/Resources.resx       |  117 +
 GroupLine.App/Properties/Settings.Designer.cs |   26 +
 GroupLine.App/Properties/Settings.settings    |    7 +
 .../ReportFile/AppearanceTestTemplate.xlsx    |  Bin 0 -> 10258 bytes
 .../ReportFile/BurPlugInstallTemplate.xlsx    |  Bin 0 -> 9836 bytes
 .../ReportFile/CylinderEngravTemplate.xlsx    |  Bin 0 -> 9906 bytes
 .../ReportFile/ExhInstallMesTemplate.xlsx     |  Bin 0 -> 10405 bytes
 .../ReportFile/GCDTransplantTemplate.xlsx     |  Bin 0 -> 9813 bytes
 .../ReportFile/GCylinderBurnEbTemplate.xlsx   |  Bin 0 -> 9927 bytes
 .../ReportFile/GDynStaticMachTemplate.xlsx    |  Bin 0 -> 9943 bytes
 .../ReportFile/GInsRotaResTemplate.xlsx       |  Bin 0 -> 9966 bytes
 .../ReportFile/GLeakCheckTemplate.xlsx        |  Bin 0 -> 9931 bytes
 .../ReportFile/GLowVolStartTemplate.xlsx      |  Bin 0 -> 9903 bytes
 .../ReportFile/GMagTorqueTemplate.xlsx        |  Bin 0 -> 9912 bytes
 .../ReportFile/GOilPumpInstallTemplate.xlsx   |  Bin 0 -> 9974 bytes
 .../ReportFile/GRingWeldMachTemplate.xlsx     |  Bin 0 -> 10003 bytes
 .../ReportFile/GRotorBurnEbTemplate.xlsx      |  Bin 0 -> 9892 bytes
 .../ReportFile/GRotorMagTemplate.xlsx         |  Bin 0 -> 9941 bytes
 .../ReportFile/GShrinkTubTemplate.xlsx        |  Bin 0 -> 9919 bytes
 .../ReportFile/GSpotWeldMachTemplate.xlsx     |  Bin 0 -> 10143 bytes
 .../ReportFile/GStaticDiskMachTemplate.xlsx   |  Bin 0 -> 10332 bytes
 .../ReportFile/KPCDTransplantTemplate.xlsx    |  Bin 0 -> 9813 bytes
 .../ReportFile/KPDynStaticMachTemplate.xlsx   |  Bin 0 -> 10030 bytes
 .../ReportFile/KPLeakCheckTemplate.xlsx       |  Bin 0 -> 9927 bytes
 .../ReportFile/KPLowVolStartTemplate.xlsx     |  Bin 0 -> 9898 bytes
 .../ReportFile/KPMagTorqueTemplate.xlsx       |  Bin 0 -> 9874 bytes
 .../ReportFile/KPOilPumpInstallTemplate.xlsx  |  Bin 0 -> 9939 bytes
 .../ReportFile/KPRingWeldMachDwTemplate.xlsx  |  Bin 0 -> 10003 bytes
 .../ReportFile/KPRingWeldMachTemplate.xlsx    |  Bin 0 -> 9971 bytes
 .../ReportFile/KPRingWeldMachUpTemplate.xlsx  |  Bin 0 -> 10003 bytes
 .../ReportFile/KPSealInstallTemplate.xlsx     |  Bin 0 -> 10196 bytes
 .../ReportFile/KPShrinkTubTemplate.xlsx       |  Bin 0 -> 9919 bytes
 .../ReportFile/KPSpotWeldMachTemplate.xlsx    |  Bin 0 -> 10034 bytes
 .../ReportFile/KPStaticDiskMachTemplate.xlsx  |  Bin 0 -> 10119 bytes
 .../ReportFile/KPUpBurnEbTemplate.xlsx        |  Bin 0 -> 9908 bytes
 .../ReportFile/MagTorqueTemplate.xlsx         |  Bin 0 -> 9970 bytes
 .../ReportFile/OilPumpInstallTemplate.xlsx    |  Bin 0 -> 9989 bytes
 .../ReportFile/OverflowLeakMesTemplate.xlsx   |  Bin 0 -> 10068 bytes
 .../ReportFile/PCoreMesTemplate.xlsx          |  Bin 0 -> 9903 bytes
 .../ReportFile/PLowWeldTemplate.xlsx          |  Bin 0 -> 10015 bytes
 .../ReportFile/PRacktPressTemplate.xlsx       |  Bin 0 -> 9926 bytes
 .../ReportFile/PRacktWeldTemplate.xlsx        |  Bin 0 -> 9860 bytes
 .../ReportFile/PlaquePrintTemplate.xlsx       |  Bin 0 -> 9972 bytes
 .../ReportFile/StaticDiscPressTemplate.xlsx   |  Bin 0 -> 9923 bytes
 .../ReportFile/TermWeldTemplate.xlsx          |  Bin 0 -> 10049 bytes
 .../AppearanceTest/AppearanceTestIndex.xaml   |  214 +
 .../AppearanceTestIndex.xaml.cs               |   15 +
 .../BurPlugInstall/BurPlugInstallView.xaml    |  154 +
 .../BurPlugInstall/BurPlugInstallView.xaml.cs |   28 +
 .../CylinderEngrav/CylinderEngravView.xaml    |  142 +
 .../CylinderEngrav/CylinderEngravView.xaml.cs |   28 +
 .../View/DbDataClear/DbDataClearView.xaml     |   83 +
 .../View/DbDataClear/DbDataClearView.xaml.cs  |   28 +
 .../View/ExhInstallMes/ExhInstallMesView.xaml |  287 ++
 .../ExhInstallMes/ExhInstallMesView.xaml.cs   |   28 +
 .../View/GCDTransplant/GCDTransplantView.xaml |  137 +
 .../GCDTransplant/GCDTransplantView.xaml.cs   |   28 +
 .../GCylinderBurnEb/GCylinderBurnEbView.xaml  |  157 +
 .../GCylinderBurnEbView.xaml.cs               |   28 +
 .../GDynStaticMach/GDynStaticMachView.xaml    |  167 +
 .../GDynStaticMach/GDynStaticMachView.xaml.cs |   28 +
 .../View/GInsRotaRes/GInsRotaResView.xaml     |  171 +
 .../View/GInsRotaRes/GInsRotaResView.xaml.cs  |   28 +
 .../View/GLeakCheck/GLeakCheckView.xaml       |  157 +
 .../View/GLeakCheck/GLeakCheckView.xaml.cs    |   28 +
 .../View/GLowVolStart/GLowVolStartView.xaml   |  162 +
 .../GLowVolStart/GLowVolStartView.xaml.cs     |   28 +
 .../View/GMagTorque/GMagTorqueView.xaml       |  152 +
 .../View/GMagTorque/GMagTorqueView.xaml.cs    |   28 +
 .../GOilPumpInstall/GOilPumpInstallView.xaml  |  167 +
 .../GOilPumpInstallView.xaml.cs               |   28 +
 .../View/GRingWeldMach/GRingWeldMachView.xaml |  187 +
 .../GRingWeldMach/GRingWeldMachView.xaml.cs   |   28 +
 .../View/GRotorBurnEb/GRotorBurnEbView.xaml   |  147 +
 .../GRotorBurnEb/GRotorBurnEbView.xaml.cs     |   28 +
 .../View/GRotorMag/GRotorMagView.xaml         |  163 +
 .../View/GRotorMag/GRotorMagView.xaml.cs      |   28 +
 .../View/GShrinkTub/GShrinkTubView.xaml       |  157 +
 .../View/GShrinkTub/GShrinkTubView.xaml.cs    |   28 +
 .../View/GSpotWeldMach/GSpotWeldMachView.xaml |  289 ++
 .../GSpotWeldMach/GSpotWeldMachView.xaml.cs   |   28 +
 .../GStaticDiskMach/GStaticDiskMachView.xaml  |  295 ++
 .../GStaticDiskMachView.xaml.cs               |   28 +
 .../KPCDTransplant/KPCDTransplantView.xaml    |  137 +
 .../KPCDTransplant/KPCDTransplantView.xaml.cs |   28 +
 .../KPDynStaticMach/KPDynStaticMachView.xaml  |  189 +
 .../KPDynStaticMachView.xaml.cs               |   28 +
 .../View/KPLeakCheck/KPLeakCheckView.xaml     |  157 +
 .../View/KPLeakCheck/KPLeakCheckView.xaml.cs  |   28 +
 .../View/KPLowVolStart/KPLowVolStartView.xaml |  162 +
 .../KPLowVolStart/KPLowVolStartView.xaml.cs   |   28 +
 .../View/KPMagTorque/KPMagTorqueView.xaml     |  152 +
 .../View/KPMagTorque/KPMagTorqueView.xaml.cs  |   28 +
 .../KPOilPumpInstallView.xaml                 |  167 +
 .../KPOilPumpInstallView.xaml.cs              |   28 +
 .../KPRingWeldMach/KPRingWeldMachView.xaml    |  187 +
 .../KPRingWeldMach/KPRingWeldMachView.xaml.cs |   28 +
 .../KPRingWeldMachDwView.xaml                 |  187 +
 .../KPRingWeldMachDwView.xaml.cs              |   28 +
 .../KPRingWeldMachUpView.xaml                 |  187 +
 .../KPRingWeldMachUpView.xaml.cs              |   28 +
 .../View/KPSealInstall/KPSealInstallView.xaml |  299 ++
 .../KPSealInstall/KPSealInstallView.xaml.cs   |   28 +
 .../View/KPShrinkTub/KPShrinkTubView.xaml     |  157 +
 .../View/KPShrinkTub/KPShrinkTubView.xaml.cs  |   28 +
 .../KPSpotWeldMach/KPSpotWeldMachView.xaml    |  237 ++
 .../KPSpotWeldMach/KPSpotWeldMachView.xaml.cs |   28 +
 .../KPStaticDiskMachView.xaml                 |  295 ++
 .../KPStaticDiskMachView.xaml.cs              |   28 +
 .../View/KPUpBurnEb/KPUpBurnEbView.xaml       |  152 +
 .../View/KPUpBurnEb/KPUpBurnEbView.xaml.cs    |   28 +
 GroupLine.App/View/KanBan/KanBanIndex.xaml    |  300 ++
 GroupLine.App/View/KanBan/KanBanIndex.xaml.cs |   55 +
 GroupLine.App/View/KanBan/KanBan_Create.xaml  |  111 +
 .../View/KanBan/KanBan_Create.xaml.cs         |   28 +
 .../View/KanBan/KanBan_PlanCountCreate.xaml   |  126 +
 .../KanBan/KanBan_PlanCountCreate.xaml.cs     |   27 +
 .../View/KanBan/KanBan_PlanCountUpdate.xaml   |  126 +
 .../KanBan/KanBan_PlanCountUpdate.xaml.cs     |   28 +
 GroupLine.App/View/KanBan/KanBan_Update.xaml  |  110 +
 .../View/KanBan/KanBan_Update.xaml.cs         |   28 +
 .../View/MagTorque/MagTorqueView.xaml         |  145 +
 .../View/MagTorque/MagTorqueView.xaml.cs      |   15 +
 GroupLine.App/View/MsgInput.xaml              |   38 +
 GroupLine.App/View/MsgInput.xaml.cs           |   40 +
 .../View/OffsetConfig/OffsetConfigIndex.xaml  |   79 +
 .../OffsetConfig/OffsetConfigIndex.xaml.cs    |   15 +
 .../OilPumpInstall/OilPumpInstallView.xaml    |  158 +
 .../OilPumpInstall/OilPumpInstallView.xaml.cs |   28 +
 .../OverflowLeakMes/OverflowLeakMesView.xaml  |  204 +
 .../OverflowLeakMesView.xaml.cs               |   28 +
 GroupLine.App/View/PCoreMes/PCoreMesView.xaml |  146 +
 .../View/PCoreMes/PCoreMesView.xaml.cs        |   28 +
 GroupLine.App/View/PLowWeld/PLowWeldView.xaml |  176 +
 .../View/PLowWeld/PLowWeldView.xaml.cs        |   28 +
 .../View/PRacktPress/PRacktPressView.xaml     |  156 +
 .../View/PRacktPress/PRacktPressView.xaml.cs  |   28 +
 .../View/PRacktWeld/PRacktWeldView.xaml       |  146 +
 .../View/PRacktWeld/PRacktWeldView.xaml.cs    |   28 +
 .../ReportTimeConfigIndex.xaml                |   81 +
 .../ReportTimeConfigIndex.xaml.cs             |   15 +
 .../StaticDiscPress/StaticDiscPressView.xaml  |  156 +
 .../StaticDiscPressView.xaml.cs               |   28 +
 GroupLine.App/View/TermWeld/TermWeldView.xaml |  162 +
 .../View/TermWeld/TermWeldView.xaml.cs        |   28 +
 GroupLine.App/View/UserControlMenuItem.xaml   |   47 +
 .../View/UserControlMenuItem.xaml.cs          |   30 +
 .../ViewModel/AppearanceTestViewModel.cs      |  379 ++
 .../ViewModel/BurPlugInstallViewModel.cs      |  362 ++
 .../ViewModel/CylinderEngravViewModel.cs      |  359 ++
 .../ViewModel/DbDataClearViewModel.cs         |  161 +
 .../ViewModel/ExhInstallMesViewModel.cs       |  388 ++
 .../ViewModel/GCDTransplantViewModel.cs       |  358 ++
 .../ViewModel/GCylinderBurnEbViewModel.cs     |  362 ++
 .../ViewModel/GDynStaticMachViewModel.cs      |  365 ++
 .../ViewModel/GInsRotaResViewModel.cs         |  365 ++
 .../ViewModel/GLeakCheckViewModel.cs          |  362 ++
 .../ViewModel/GLowVolStartViewModel.cs        |  363 ++
 .../ViewModel/GMagTorqueViewModel.cs          |  361 ++
 .../ViewModel/GOilPumpInstallViewModel.cs     |  364 ++
 .../ViewModel/GRingWeldMachViewModel.cs       |  368 ++
 .../ViewModel/GRotorBurnEbViewModel.cs        |  360 ++
 GroupLine.App/ViewModel/GRotorMagViewModel.cs |  363 ++
 .../ViewModel/GShrinkTubViewModel.cs          |  362 ++
 .../ViewModel/GSpotWeldMachViewModel.cs       |  384 ++
 .../ViewModel/GStaticDiskMachViewModel.cs     |  387 ++
 GroupLine.App/ViewModel/ItemMenu.cs           |   28 +
 .../ViewModel/KPCDTransplantViewModel.cs      |  358 ++
 .../ViewModel/KPDynStaticMachViewModel.cs     |  368 ++
 .../ViewModel/KPLeakCheckViewModel.cs         |  362 ++
 .../ViewModel/KPLowVolStartViewModel.cs       |  363 ++
 .../ViewModel/KPMagTorqueViewModel.cs         |  361 ++
 .../ViewModel/KPOilPumpInstallViewModel.cs    |  364 ++
 .../ViewModel/KPRingWeldMachDwViewModel.cs    |  371 ++
 .../ViewModel/KPRingWeldMachUpViewModel.cs    |  371 ++
 .../ViewModel/KPRingWeldMachViewModel.cs      |  368 ++
 .../ViewModel/KPSealInstallViewModel.cs       |  386 ++
 .../ViewModel/KPShrinkTubViewModel.cs         |  365 ++
 .../ViewModel/KPSpotWeldMachViewModel.cs      |  378 ++
 .../ViewModel/KPStaticDiskMachViewModel.cs    |  387 ++
 .../ViewModel/KPUpBurnEbViewModel.cs          |  361 ++
 GroupLine.App/ViewModel/KanBanViewModel.cs    | 1021 +++++
 GroupLine.App/ViewModel/MagTorqueViewModel.cs |  360 ++
 GroupLine.App/ViewModel/MainViewModel.cs      |   34 +
 .../ViewModel/OffsetConfigViewModel.cs        |  196 +
 .../ViewModel/OilPumpInstallViewModel.cs      |  363 ++
 .../ViewModel/OverflowLeakMesViewModel.cs     |  372 ++
 GroupLine.App/ViewModel/PCoreMesViewModel.cs  |  360 ++
 GroupLine.App/ViewModel/PLowWeldViewModel.cs  |  366 ++
 .../ViewModel/PRacktPressViewModel.cs         |  362 ++
 .../ViewModel/PRacktWeldViewModel.cs          |  360 ++
 .../ViewModel/ReportTimeConfigViewModel.cs    |  190 +
 .../ViewModel/StaticDiscPressViewModel.cs     |  362 ++
 GroupLine.App/ViewModel/SubItem.cs            |   16 +
 GroupLine.App/ViewModel/TermWeldViewModel.cs  |  363 ++
 GroupLine.App/ViewModel/ViewModelLocator.cs   |  480 +++
 GroupLine.App/packages.config                 |   19 +
 GroupLine.Com/ConfigHelper.cs                 |   55 +
 GroupLine.Com/GroupLine.Com.csproj            |   49 +
 GroupLine.Com/Properties/AssemblyInfo.cs      |   35 +
 GroupLine.Model/AppearanceTest.cs             |  130 +
 GroupLine.Model/BurPlugInstall.cs             |   57 +
 GroupLine.Model/CylinderEngrav.cs             |   37 +
 GroupLine.Model/ExhInstallMes.cs              |  213 +
 GroupLine.Model/GCDTransplant.cs              |   32 +
 GroupLine.Model/GCylinderBurnEb.cs            |   53 +
 GroupLine.Model/GDynStaticMach.cs             |   64 +
 GroupLine.Model/GInsRotaRes.cs                |   70 +
 GroupLine.Model/GLeakCheck.cs                 |   52 +
 GroupLine.Model/GLowVolStart.cs               |   57 +
 GroupLine.Model/GMagTorque.cs                 |   47 +
 GroupLine.Model/GOilPumpInstall.cs            |   63 +
 GroupLine.Model/GRingWeldMach.cs              |   82 +
 GroupLine.Model/GRotorBurnEb.cs               |   43 +
 GroupLine.Model/GRotorMag.cs                  |   57 +
 GroupLine.Model/GShrinkTub.cs                 |   52 +
 GroupLine.Model/GSpotWeldMach.cs              |  162 +
 GroupLine.Model/GStaticDiskMach.cs            |  206 +
 GroupLine.Model/GroupLine.Model.csproj        |   99 +
 GroupLine.Model/KPCDTransplant.cs             |   32 +
 GroupLine.Model/KPDynStaticMach.cs            |   96 +
 GroupLine.Model/KPLeakCheck.cs                |   52 +
 GroupLine.Model/KPLowVolStart.cs              |   57 +
 GroupLine.Model/KPMagTorque.cs                |   47 +
 GroupLine.Model/KPOilPumpInstall.cs           |   63 +
 GroupLine.Model/KPRingWeldMach.cs             |   82 +
 GroupLine.Model/KPRingWeldMachDw.cs           |   86 +
 GroupLine.Model/KPRingWeldMachUp.cs           |   86 +
 GroupLine.Model/KPSealInstall.cs              |  187 +
 GroupLine.Model/KPShrinkTub.cs                |   58 +
 GroupLine.Model/KPSpotWeldMach.cs             |  132 +
 GroupLine.Model/KPStaticDiskMach.cs           |  205 +
 GroupLine.Model/KPUpBurnEb.cs                 |   58 +
 GroupLine.Model/KanBan/PlanCount.cs           |   53 +
 GroupLine.Model/KanBan/WorkTime.cs            |   46 +
 GroupLine.Model/MagTorque.cs                  |   54 +
 GroupLine.Model/OffsetConfig.cs               |   41 +
 GroupLine.Model/OilPumpInstall.cs             |   65 +
 GroupLine.Model/OverflowLeakMes.cs            |  124 +
 GroupLine.Model/PCoreMes.cs                   |   42 +
 GroupLine.Model/PLowWeld.cs                   |   73 +
 GroupLine.Model/PRacktPress.cs                |   53 +
 GroupLine.Model/PRacktWeld.cs                 |   43 +
 GroupLine.Model/PlaquePrint.cs                |   20 +
 GroupLine.Model/Properties/AssemblyInfo.cs    |   35 +
 GroupLine.Model/StaticDiscPress.cs            |   53 +
 GroupLine.Model/SystemConfig.cs               |   48 +
 GroupLine.Model/TermWeld.cs                   |   57 +
 GroupLine.Model/packages.config               |    4 +
 GroupLine.sln                                 |   37 +
 309 files changed, 41803 insertions(+)
 create mode 100644 GroupLine.App/App.config
 create mode 100644 GroupLine.App/App.xaml
 create mode 100644 GroupLine.App/App.xaml.cs
 create mode 100644 GroupLine.App/Assets/TextBox.xaml
 create mode 100644 GroupLine.App/FSqlContext.cs
 create mode 100644 GroupLine.App/GroupLine.App.csproj
 create mode 100644 GroupLine.App/Images/P0.ico
 create mode 100644 GroupLine.App/Images/logo.png
 create mode 100644 GroupLine.App/MainWindow.xaml
 create mode 100644 GroupLine.App/MainWindow.xaml.cs
 create mode 100644 GroupLine.App/ModelDto/AppearanceTestDto.cs
 create mode 100644 GroupLine.App/ModelDto/BurPlugInstallDto.cs
 create mode 100644 GroupLine.App/ModelDto/ComboBoxModel.cs
 create mode 100644 GroupLine.App/ModelDto/CylinderEngravDto.cs
 create mode 100644 GroupLine.App/ModelDto/ExhInstallMesDto.cs
 create mode 100644 GroupLine.App/ModelDto/GCDTransplantDto.cs
 create mode 100644 GroupLine.App/ModelDto/GCylinderBurnEbDto.cs
 create mode 100644 GroupLine.App/ModelDto/GDynStaticMachDto.cs
 create mode 100644 GroupLine.App/ModelDto/GInsRotaResDto.cs
 create mode 100644 GroupLine.App/ModelDto/GLeakCheckDto.cs
 create mode 100644 GroupLine.App/ModelDto/GLowVolStartDto.cs
 create mode 100644 GroupLine.App/ModelDto/GMagTorqueDto.cs
 create mode 100644 GroupLine.App/ModelDto/GOilPumpInstallDto.cs
 create mode 100644 GroupLine.App/ModelDto/GRingWeldMachDto.cs
 create mode 100644 GroupLine.App/ModelDto/GRotorBurnEbDto.cs
 create mode 100644 GroupLine.App/ModelDto/GRotorMagDto.cs
 create mode 100644 GroupLine.App/ModelDto/GShrinkTubDto.cs
 create mode 100644 GroupLine.App/ModelDto/GSpotWeldMachDto.cs
 create mode 100644 GroupLine.App/ModelDto/GStaticDiskMachDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPCDTransplantDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPDynStaticMachDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPLeakCheckDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPLowVolStartDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPMagTorqueDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPOilPumpInstallDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPRingWeldMachDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPRingWeldMachDwDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPRingWeldMachUpDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPSealInstallDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPShrinkTubDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPSpotWeldMachDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPStaticDiskMachDto.cs
 create mode 100644 GroupLine.App/ModelDto/KPUpBurnEbDto.cs
 create mode 100644 GroupLine.App/ModelDto/KanBan/PlanCountDto.cs
 create mode 100644 GroupLine.App/ModelDto/KanBan/WorkTimeDto.cs
 create mode 100644 GroupLine.App/ModelDto/MagTorqueDto.cs
 create mode 100644 GroupLine.App/ModelDto/OilPumpInstallDto.cs
 create mode 100644 GroupLine.App/ModelDto/OverflowLeakMesDto.cs
 create mode 100644 GroupLine.App/ModelDto/PCoreMesDto.cs
 create mode 100644 GroupLine.App/ModelDto/PLowWeldDto.cs
 create mode 100644 GroupLine.App/ModelDto/PRacktPressDto.cs
 create mode 100644 GroupLine.App/ModelDto/PRacktWeldDto.cs
 create mode 100644 GroupLine.App/ModelDto/StaticDiscPressDto.cs
 create mode 100644 GroupLine.App/ModelDto/TermWeldDto.cs
 create mode 100644 GroupLine.App/ModelDto/ValidateModelBase.cs
 create mode 100644 GroupLine.App/NLog.config
 create mode 100644 GroupLine.App/NLog.xsd
 create mode 100644 GroupLine.App/Properties/AssemblyInfo.cs
 create mode 100644 GroupLine.App/Properties/Resources.Designer.cs
 create mode 100644 GroupLine.App/Properties/Resources.resx
 create mode 100644 GroupLine.App/Properties/Settings.Designer.cs
 create mode 100644 GroupLine.App/Properties/Settings.settings
 create mode 100644 GroupLine.App/ReportFile/AppearanceTestTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/BurPlugInstallTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/CylinderEngravTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/ExhInstallMesTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GCDTransplantTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GCylinderBurnEbTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GDynStaticMachTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GInsRotaResTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GLeakCheckTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GLowVolStartTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GMagTorqueTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GOilPumpInstallTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GRingWeldMachTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GRotorBurnEbTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GRotorMagTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GShrinkTubTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GSpotWeldMachTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/GStaticDiskMachTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPCDTransplantTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPDynStaticMachTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPLeakCheckTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPLowVolStartTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPMagTorqueTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPOilPumpInstallTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPRingWeldMachDwTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPRingWeldMachTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPRingWeldMachUpTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPSealInstallTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPShrinkTubTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPSpotWeldMachTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPStaticDiskMachTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/KPUpBurnEbTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/MagTorqueTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/OilPumpInstallTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/OverflowLeakMesTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/PCoreMesTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/PLowWeldTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/PRacktPressTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/PRacktWeldTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/PlaquePrintTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/StaticDiscPressTemplate.xlsx
 create mode 100644 GroupLine.App/ReportFile/TermWeldTemplate.xlsx
 create mode 100644 GroupLine.App/View/AppearanceTest/AppearanceTestIndex.xaml
 create mode 100644 GroupLine.App/View/AppearanceTest/AppearanceTestIndex.xaml.cs
 create mode 100644 GroupLine.App/View/BurPlugInstall/BurPlugInstallView.xaml
 create mode 100644 GroupLine.App/View/BurPlugInstall/BurPlugInstallView.xaml.cs
 create mode 100644 GroupLine.App/View/CylinderEngrav/CylinderEngravView.xaml
 create mode 100644 GroupLine.App/View/CylinderEngrav/CylinderEngravView.xaml.cs
 create mode 100644 GroupLine.App/View/DbDataClear/DbDataClearView.xaml
 create mode 100644 GroupLine.App/View/DbDataClear/DbDataClearView.xaml.cs
 create mode 100644 GroupLine.App/View/ExhInstallMes/ExhInstallMesView.xaml
 create mode 100644 GroupLine.App/View/ExhInstallMes/ExhInstallMesView.xaml.cs
 create mode 100644 GroupLine.App/View/GCDTransplant/GCDTransplantView.xaml
 create mode 100644 GroupLine.App/View/GCDTransplant/GCDTransplantView.xaml.cs
 create mode 100644 GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml
 create mode 100644 GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml.cs
 create mode 100644 GroupLine.App/View/GDynStaticMach/GDynStaticMachView.xaml
 create mode 100644 GroupLine.App/View/GDynStaticMach/GDynStaticMachView.xaml.cs
 create mode 100644 GroupLine.App/View/GInsRotaRes/GInsRotaResView.xaml
 create mode 100644 GroupLine.App/View/GInsRotaRes/GInsRotaResView.xaml.cs
 create mode 100644 GroupLine.App/View/GLeakCheck/GLeakCheckView.xaml
 create mode 100644 GroupLine.App/View/GLeakCheck/GLeakCheckView.xaml.cs
 create mode 100644 GroupLine.App/View/GLowVolStart/GLowVolStartView.xaml
 create mode 100644 GroupLine.App/View/GLowVolStart/GLowVolStartView.xaml.cs
 create mode 100644 GroupLine.App/View/GMagTorque/GMagTorqueView.xaml
 create mode 100644 GroupLine.App/View/GMagTorque/GMagTorqueView.xaml.cs
 create mode 100644 GroupLine.App/View/GOilPumpInstall/GOilPumpInstallView.xaml
 create mode 100644 GroupLine.App/View/GOilPumpInstall/GOilPumpInstallView.xaml.cs
 create mode 100644 GroupLine.App/View/GRingWeldMach/GRingWeldMachView.xaml
 create mode 100644 GroupLine.App/View/GRingWeldMach/GRingWeldMachView.xaml.cs
 create mode 100644 GroupLine.App/View/GRotorBurnEb/GRotorBurnEbView.xaml
 create mode 100644 GroupLine.App/View/GRotorBurnEb/GRotorBurnEbView.xaml.cs
 create mode 100644 GroupLine.App/View/GRotorMag/GRotorMagView.xaml
 create mode 100644 GroupLine.App/View/GRotorMag/GRotorMagView.xaml.cs
 create mode 100644 GroupLine.App/View/GShrinkTub/GShrinkTubView.xaml
 create mode 100644 GroupLine.App/View/GShrinkTub/GShrinkTubView.xaml.cs
 create mode 100644 GroupLine.App/View/GSpotWeldMach/GSpotWeldMachView.xaml
 create mode 100644 GroupLine.App/View/GSpotWeldMach/GSpotWeldMachView.xaml.cs
 create mode 100644 GroupLine.App/View/GStaticDiskMach/GStaticDiskMachView.xaml
 create mode 100644 GroupLine.App/View/GStaticDiskMach/GStaticDiskMachView.xaml.cs
 create mode 100644 GroupLine.App/View/KPCDTransplant/KPCDTransplantView.xaml
 create mode 100644 GroupLine.App/View/KPCDTransplant/KPCDTransplantView.xaml.cs
 create mode 100644 GroupLine.App/View/KPDynStaticMach/KPDynStaticMachView.xaml
 create mode 100644 GroupLine.App/View/KPDynStaticMach/KPDynStaticMachView.xaml.cs
 create mode 100644 GroupLine.App/View/KPLeakCheck/KPLeakCheckView.xaml
 create mode 100644 GroupLine.App/View/KPLeakCheck/KPLeakCheckView.xaml.cs
 create mode 100644 GroupLine.App/View/KPLowVolStart/KPLowVolStartView.xaml
 create mode 100644 GroupLine.App/View/KPLowVolStart/KPLowVolStartView.xaml.cs
 create mode 100644 GroupLine.App/View/KPMagTorque/KPMagTorqueView.xaml
 create mode 100644 GroupLine.App/View/KPMagTorque/KPMagTorqueView.xaml.cs
 create mode 100644 GroupLine.App/View/KPOilPumpInstall/KPOilPumpInstallView.xaml
 create mode 100644 GroupLine.App/View/KPOilPumpInstall/KPOilPumpInstallView.xaml.cs
 create mode 100644 GroupLine.App/View/KPRingWeldMach/KPRingWeldMachView.xaml
 create mode 100644 GroupLine.App/View/KPRingWeldMach/KPRingWeldMachView.xaml.cs
 create mode 100644 GroupLine.App/View/KPRingWeldMachDw/KPRingWeldMachDwView.xaml
 create mode 100644 GroupLine.App/View/KPRingWeldMachDw/KPRingWeldMachDwView.xaml.cs
 create mode 100644 GroupLine.App/View/KPRingWeldMachUp/KPRingWeldMachUpView.xaml
 create mode 100644 GroupLine.App/View/KPRingWeldMachUp/KPRingWeldMachUpView.xaml.cs
 create mode 100644 GroupLine.App/View/KPSealInstall/KPSealInstallView.xaml
 create mode 100644 GroupLine.App/View/KPSealInstall/KPSealInstallView.xaml.cs
 create mode 100644 GroupLine.App/View/KPShrinkTub/KPShrinkTubView.xaml
 create mode 100644 GroupLine.App/View/KPShrinkTub/KPShrinkTubView.xaml.cs
 create mode 100644 GroupLine.App/View/KPSpotWeldMach/KPSpotWeldMachView.xaml
 create mode 100644 GroupLine.App/View/KPSpotWeldMach/KPSpotWeldMachView.xaml.cs
 create mode 100644 GroupLine.App/View/KPStaticDiskMach/KPStaticDiskMachView.xaml
 create mode 100644 GroupLine.App/View/KPStaticDiskMach/KPStaticDiskMachView.xaml.cs
 create mode 100644 GroupLine.App/View/KPUpBurnEb/KPUpBurnEbView.xaml
 create mode 100644 GroupLine.App/View/KPUpBurnEb/KPUpBurnEbView.xaml.cs
 create mode 100644 GroupLine.App/View/KanBan/KanBanIndex.xaml
 create mode 100644 GroupLine.App/View/KanBan/KanBanIndex.xaml.cs
 create mode 100644 GroupLine.App/View/KanBan/KanBan_Create.xaml
 create mode 100644 GroupLine.App/View/KanBan/KanBan_Create.xaml.cs
 create mode 100644 GroupLine.App/View/KanBan/KanBan_PlanCountCreate.xaml
 create mode 100644 GroupLine.App/View/KanBan/KanBan_PlanCountCreate.xaml.cs
 create mode 100644 GroupLine.App/View/KanBan/KanBan_PlanCountUpdate.xaml
 create mode 100644 GroupLine.App/View/KanBan/KanBan_PlanCountUpdate.xaml.cs
 create mode 100644 GroupLine.App/View/KanBan/KanBan_Update.xaml
 create mode 100644 GroupLine.App/View/KanBan/KanBan_Update.xaml.cs
 create mode 100644 GroupLine.App/View/MagTorque/MagTorqueView.xaml
 create mode 100644 GroupLine.App/View/MagTorque/MagTorqueView.xaml.cs
 create mode 100644 GroupLine.App/View/MsgInput.xaml
 create mode 100644 GroupLine.App/View/MsgInput.xaml.cs
 create mode 100644 GroupLine.App/View/OffsetConfig/OffsetConfigIndex.xaml
 create mode 100644 GroupLine.App/View/OffsetConfig/OffsetConfigIndex.xaml.cs
 create mode 100644 GroupLine.App/View/OilPumpInstall/OilPumpInstallView.xaml
 create mode 100644 GroupLine.App/View/OilPumpInstall/OilPumpInstallView.xaml.cs
 create mode 100644 GroupLine.App/View/OverflowLeakMes/OverflowLeakMesView.xaml
 create mode 100644 GroupLine.App/View/OverflowLeakMes/OverflowLeakMesView.xaml.cs
 create mode 100644 GroupLine.App/View/PCoreMes/PCoreMesView.xaml
 create mode 100644 GroupLine.App/View/PCoreMes/PCoreMesView.xaml.cs
 create mode 100644 GroupLine.App/View/PLowWeld/PLowWeldView.xaml
 create mode 100644 GroupLine.App/View/PLowWeld/PLowWeldView.xaml.cs
 create mode 100644 GroupLine.App/View/PRacktPress/PRacktPressView.xaml
 create mode 100644 GroupLine.App/View/PRacktPress/PRacktPressView.xaml.cs
 create mode 100644 GroupLine.App/View/PRacktWeld/PRacktWeldView.xaml
 create mode 100644 GroupLine.App/View/PRacktWeld/PRacktWeldView.xaml.cs
 create mode 100644 GroupLine.App/View/ReportTimeConfig/ReportTimeConfigIndex.xaml
 create mode 100644 GroupLine.App/View/ReportTimeConfig/ReportTimeConfigIndex.xaml.cs
 create mode 100644 GroupLine.App/View/StaticDiscPress/StaticDiscPressView.xaml
 create mode 100644 GroupLine.App/View/StaticDiscPress/StaticDiscPressView.xaml.cs
 create mode 100644 GroupLine.App/View/TermWeld/TermWeldView.xaml
 create mode 100644 GroupLine.App/View/TermWeld/TermWeldView.xaml.cs
 create mode 100644 GroupLine.App/View/UserControlMenuItem.xaml
 create mode 100644 GroupLine.App/View/UserControlMenuItem.xaml.cs
 create mode 100644 GroupLine.App/ViewModel/AppearanceTestViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/BurPlugInstallViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/CylinderEngravViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/DbDataClearViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/ExhInstallMesViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GCDTransplantViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GCylinderBurnEbViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GDynStaticMachViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GInsRotaResViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GLeakCheckViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GLowVolStartViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GMagTorqueViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GOilPumpInstallViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GRingWeldMachViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GRotorBurnEbViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GRotorMagViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GShrinkTubViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GSpotWeldMachViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/GStaticDiskMachViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/ItemMenu.cs
 create mode 100644 GroupLine.App/ViewModel/KPCDTransplantViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPDynStaticMachViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPLeakCheckViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPLowVolStartViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPMagTorqueViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPOilPumpInstallViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPRingWeldMachDwViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPRingWeldMachUpViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPRingWeldMachViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPSealInstallViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPShrinkTubViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPSpotWeldMachViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPStaticDiskMachViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KPUpBurnEbViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/KanBanViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/MagTorqueViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/MainViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/OffsetConfigViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/OilPumpInstallViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/OverflowLeakMesViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/PCoreMesViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/PLowWeldViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/PRacktPressViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/PRacktWeldViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/ReportTimeConfigViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/StaticDiscPressViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/SubItem.cs
 create mode 100644 GroupLine.App/ViewModel/TermWeldViewModel.cs
 create mode 100644 GroupLine.App/ViewModel/ViewModelLocator.cs
 create mode 100644 GroupLine.App/packages.config
 create mode 100644 GroupLine.Com/ConfigHelper.cs
 create mode 100644 GroupLine.Com/GroupLine.Com.csproj
 create mode 100644 GroupLine.Com/Properties/AssemblyInfo.cs
 create mode 100644 GroupLine.Model/AppearanceTest.cs
 create mode 100644 GroupLine.Model/BurPlugInstall.cs
 create mode 100644 GroupLine.Model/CylinderEngrav.cs
 create mode 100644 GroupLine.Model/ExhInstallMes.cs
 create mode 100644 GroupLine.Model/GCDTransplant.cs
 create mode 100644 GroupLine.Model/GCylinderBurnEb.cs
 create mode 100644 GroupLine.Model/GDynStaticMach.cs
 create mode 100644 GroupLine.Model/GInsRotaRes.cs
 create mode 100644 GroupLine.Model/GLeakCheck.cs
 create mode 100644 GroupLine.Model/GLowVolStart.cs
 create mode 100644 GroupLine.Model/GMagTorque.cs
 create mode 100644 GroupLine.Model/GOilPumpInstall.cs
 create mode 100644 GroupLine.Model/GRingWeldMach.cs
 create mode 100644 GroupLine.Model/GRotorBurnEb.cs
 create mode 100644 GroupLine.Model/GRotorMag.cs
 create mode 100644 GroupLine.Model/GShrinkTub.cs
 create mode 100644 GroupLine.Model/GSpotWeldMach.cs
 create mode 100644 GroupLine.Model/GStaticDiskMach.cs
 create mode 100644 GroupLine.Model/GroupLine.Model.csproj
 create mode 100644 GroupLine.Model/KPCDTransplant.cs
 create mode 100644 GroupLine.Model/KPDynStaticMach.cs
 create mode 100644 GroupLine.Model/KPLeakCheck.cs
 create mode 100644 GroupLine.Model/KPLowVolStart.cs
 create mode 100644 GroupLine.Model/KPMagTorque.cs
 create mode 100644 GroupLine.Model/KPOilPumpInstall.cs
 create mode 100644 GroupLine.Model/KPRingWeldMach.cs
 create mode 100644 GroupLine.Model/KPRingWeldMachDw.cs
 create mode 100644 GroupLine.Model/KPRingWeldMachUp.cs
 create mode 100644 GroupLine.Model/KPSealInstall.cs
 create mode 100644 GroupLine.Model/KPShrinkTub.cs
 create mode 100644 GroupLine.Model/KPSpotWeldMach.cs
 create mode 100644 GroupLine.Model/KPStaticDiskMach.cs
 create mode 100644 GroupLine.Model/KPUpBurnEb.cs
 create mode 100644 GroupLine.Model/KanBan/PlanCount.cs
 create mode 100644 GroupLine.Model/KanBan/WorkTime.cs
 create mode 100644 GroupLine.Model/MagTorque.cs
 create mode 100644 GroupLine.Model/OffsetConfig.cs
 create mode 100644 GroupLine.Model/OilPumpInstall.cs
 create mode 100644 GroupLine.Model/OverflowLeakMes.cs
 create mode 100644 GroupLine.Model/PCoreMes.cs
 create mode 100644 GroupLine.Model/PLowWeld.cs
 create mode 100644 GroupLine.Model/PRacktPress.cs
 create mode 100644 GroupLine.Model/PRacktWeld.cs
 create mode 100644 GroupLine.Model/PlaquePrint.cs
 create mode 100644 GroupLine.Model/Properties/AssemblyInfo.cs
 create mode 100644 GroupLine.Model/StaticDiscPress.cs
 create mode 100644 GroupLine.Model/SystemConfig.cs
 create mode 100644 GroupLine.Model/TermWeld.cs
 create mode 100644 GroupLine.Model/packages.config
 create mode 100644 GroupLine.sln

diff --git a/GroupLine.App/App.config b/GroupLine.App/App.config
new file mode 100644
index 0000000..7b6d270
--- /dev/null
+++ b/GroupLine.App/App.config
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+	<appSettings>
+		<add key="connecting1" value="Data Source=192.0.1.99;user instance=false;Initial Catalog=SA1;User ID=sa;Password=DAIKIN@admin" />
+		<add key="connecting1" value="Data Source=20.20.11.236;user instance=false;Initial Catalog=GroupLine;User ID=sa;Password=DAIKIN@123" />
+		<add key="connecting" value="Data Source=CT-PC;user instance=false;Initial Catalog=GroupLine;User ID=sa;Password=12345678" />
+		<add key="FilePath" value="E:\MyTest\" />
+		<add key="StandardProductPacing" value="30" />
+		<add key="Model" value="手动模式" />
+		<add key="ClientSettingsProvider.ServiceUri" value="" />
+		<add key="Location" value="0" />
+		<add key="Carousel" value="5" />
+		<add key="CycleTime" value="15" />
+		<add key="ReportTime" value="-30" />
+		<add key="ReportOutPutTime" value="00:01" />
+		<add key="WorkingDayAM" value="00:59" />
+		<add key="WorkingDayPM" value="20:00" />
+	</appSettings>
+	
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="MaterialDesignColors" publicKeyToken="df2a72020bd7962a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.0.4.3" newVersion="2.0.4.3" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/GroupLine.App/App.xaml b/GroupLine.App/App.xaml
new file mode 100644
index 0000000..9a2da40
--- /dev/null
+++ b/GroupLine.App/App.xaml
@@ -0,0 +1,22 @@
+<Application
+    x:Class="GroupLine.App.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:local="clr-namespace:GroupLine.App"
+    xmlns:vm="clr-namespace:GroupLine.App.ViewModel"
+    d1p1:Ignorable="d"
+    StartupUri="MainWindow.xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.DeepPurple.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <vm:ViewModelLocator x:Key="Locator" d:IsDataSource="True" />
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>
diff --git a/GroupLine.App/App.xaml.cs b/GroupLine.App/App.xaml.cs
new file mode 100644
index 0000000..dda2a9b
--- /dev/null
+++ b/GroupLine.App/App.xaml.cs
@@ -0,0 +1,25 @@
+using System.Windows;
+
+namespace GroupLine.App
+{
+    /// <summary>
+    /// App.xaml 的交互逻辑
+    /// </summary>
+    public partial class App : Application
+    {
+        private static System.Threading.Mutex mutex;
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            mutex = new System.Threading.Mutex(true, "OnlyRun_CRNS");
+            if (mutex.WaitOne(0, false))
+            {
+                base.OnStartup(e);
+            }
+            else
+            {
+                MessageBox.Show("程序已经在运行！", "提示");
+                this.Shutdown();
+            }
+        }
+    }
+}
diff --git a/GroupLine.App/Assets/TextBox.xaml b/GroupLine.App/Assets/TextBox.xaml
new file mode 100644
index 0000000..bd3ceed
--- /dev/null
+++ b/GroupLine.App/Assets/TextBox.xaml
@@ -0,0 +1,104 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style
+        x:Key="{x:Type TextBoxBase}"
+        BasedOn="{x:Null}"
+        TargetType="{x:Type TextBoxBase}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="2,1,1,1" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource Accent}" />
+        <Setter Property="Validation.ErrorTemplate">
+            <Setter.Value>
+                <ControlTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <!--  BorderBrush="#FFdc000c"  -->
+                        <Border
+                            x:Name="adornerborder"
+                            VerticalAlignment="Top"
+                            BorderThickness="1">
+                            <Grid>
+                                <AdornedElementPlaceholder x:Name="adorner" Margin="-1" />
+                            </Grid>
+                        </Border>
+                        <Border
+                            x:Name="errorBorder"
+                            MinHeight="24"
+                            Margin="8,0,0,0"
+                            Background="#FFdc000c"
+                            CornerRadius="0"
+                            IsHitTestVisible="False"
+                            Opacity="0">
+                            <TextBlock
+                                Margin="8,2,8,3"
+                                VerticalAlignment="Center"
+                                Foreground="White"
+                                Text="{Binding ElementName=adorner, Path=AdornedElement.(Validation.Errors)[0].ErrorContent}"
+                                TextWrapping="Wrap" />
+                        </Border>
+                    </StackPanel>
+
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Value="True">
+                            <DataTrigger.Binding>
+                                <Binding ElementName="adorner" Path="AdornedElement.Tag" />
+                            </DataTrigger.Binding>
+                            <DataTrigger.EnterActions>
+                                <BeginStoryboard x:Name="fadeInStoryboard1">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="errorBorder"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="00:00:00.15" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.EnterActions>
+                            <DataTrigger.Setters>
+                                <Setter TargetName="adornerborder" Property="BorderBrush" Value="#FFdc000c" />
+                            </DataTrigger.Setters>
+                        </DataTrigger>
+
+                        <DataTrigger Value="True">
+                            <DataTrigger.Binding>
+                                <Binding ElementName="adorner" Path="AdornedElement.IsKeyboardFocused" />
+                            </DataTrigger.Binding>
+                            <DataTrigger.EnterActions>
+                                <BeginStoryboard x:Name="fadeInStoryboard">
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="errorBorder"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="00:00:00.15" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.EnterActions>
+                            <!--  是否保留异常直到数据正常:如果不需要则放开下列验证  -->
+                            <!--<DataTrigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="fadeInStoryboard"/>
+                                <BeginStoryboard x:Name="fadeOutStoryBoard">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="00:00:00"
+                                                         Storyboard.TargetName="errorBorder"
+                                                         Storyboard.TargetProperty="Opacity"
+                                                         To="0"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </DataTrigger.ExitActions>-->
+                            <DataTrigger.Setters>
+                                <Setter TargetName="adornerborder" Property="BorderBrush" Value="#FFdc000c" />
+                            </DataTrigger.Setters>
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+    </Style>
+    <Style BasedOn="{StaticResource {x:Type TextBoxBase}}" TargetType="{x:Type TextBox}" />
+    <Style BasedOn="{StaticResource {x:Type TextBoxBase}}" TargetType="{x:Type RichTextBox}" />
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/GroupLine.App/FSqlContext.cs b/GroupLine.App/FSqlContext.cs
new file mode 100644
index 0000000..be5182a
--- /dev/null
+++ b/GroupLine.App/FSqlContext.cs
@@ -0,0 +1,12 @@
+using GroupLine.Com;
+
+namespace GroupLine.App
+{
+    public class FSqlContext
+    {
+        public static IFreeSql FDb = new FreeSql.FreeSqlBuilder()
+                                        .UseConnectionString(FreeSql.DataType.SqlServer, ConfigHelper.GetValue("connecting"))
+                                        .UseAutoSyncStructure(true) //自动同步实体结构到数据库
+                                        .Build(); //请务必定义成 Singleton 单例模式
+    }
+}
diff --git a/GroupLine.App/GroupLine.App.csproj b/GroupLine.App/GroupLine.App.csproj
new file mode 100644
index 0000000..f0bb5cd
--- /dev/null
+++ b/GroupLine.App/GroupLine.App.csproj
@@ -0,0 +1,782 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{BDF65038-979E-4922-B285-089193C1A1F4}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>GroupLine.App</RootNamespace>
+    <AssemblyName>GroupLine.App</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Images\P0.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="AutoMapper, Version=8.0.0.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutoMapper.8.0.0\lib\net461\AutoMapper.dll</HintPath>
+    </Reference>
+    <Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
+      <HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
+    </Reference>
+    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    </Reference>
+    <Reference Include="FreeSql, Version=3.2.692.0, Culture=neutral, PublicKeyToken=a33928e5d4a4b39c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FreeSql.3.2.692\lib\net451\FreeSql.dll</HintPath>
+    </Reference>
+    <Reference Include="FreeSql.Provider.SqlServer, Version=3.2.692.0, Culture=neutral, PublicKeyToken=d313b98af285bd88, processorArchitecture=MSIL">
+      <HintPath>..\packages\FreeSql.Provider.SqlServer.3.2.692\lib\net451\FreeSql.Provider.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath>
+    </Reference>
+    <Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath>
+    </Reference>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=1.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignColors, Version=2.0.4.3, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignColors.2.0.4\lib\net452\MaterialDesignColors.dll</HintPath>
+    </Reference>
+    <Reference Include="MaterialDesignThemes.Wpf, Version=4.1.0.2556, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
+      <HintPath>..\packages\MaterialDesignThemes.4.1.0\lib\net452\MaterialDesignThemes.Wpf.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.1.2\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OOXML, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OOXML.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OpenXml4Net, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXml4Net.dll</HintPath>
+    </Reference>
+    <Reference Include="NPOI.OpenXmlFormats, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
+      <HintPath>..\packages\NPOI.2.5.5\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.SqlClient, Version=4.6.1.5, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SqlClient.4.8.5\lib\net461\System.Data.SqlClient.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="FSqlContext.cs" />
+    <Compile Include="ModelDto\KPRingWeldMachDwDto.cs" />
+    <Compile Include="ModelDto\KPRingWeldMachUpDto.cs" />
+    <Compile Include="ModelDto\KPShrinkTubDto.cs" />
+    <Compile Include="ModelDto\KPUpBurnEbDto.cs" />
+    <Compile Include="ModelDto\ComboBoxModel.cs" />
+    <Compile Include="ModelDto\OilPumpInstallDto.cs" />
+    <Compile Include="ModelDto\MagTorqueDto.cs" />
+    <Compile Include="ModelDto\KanBan\PlanCountDto.cs" />
+    <Compile Include="ModelDto\KanBan\WorkTimeDto.cs" />
+    <Compile Include="ModelDto\CylinderEngravDto.cs" />
+    <Compile Include="ModelDto\TermWeldDto.cs" />
+    <Compile Include="ModelDto\GCylinderBurnEbDto.cs" />
+    <Compile Include="ModelDto\GRotorBurnEbDto.cs" />
+    <Compile Include="ModelDto\GRotorMagDto.cs" />
+    <Compile Include="ModelDto\GInsRotaResDto.cs" />
+    <Compile Include="ModelDto\PRacktPressDto.cs" />
+    <Compile Include="ModelDto\PRacktWeldDto.cs" />
+    <Compile Include="ModelDto\PLowWeldDto.cs" />
+    <Compile Include="ModelDto\PCoreMesDto.cs" />
+    <Compile Include="ModelDto\GMagTorqueDto.cs" />
+    <Compile Include="ModelDto\KPMagTorqueDto.cs" />
+    <Compile Include="ModelDto\GOilPumpInstallDto.cs" />
+    <Compile Include="ModelDto\KPOilPumpInstallDto.cs" />
+    <Compile Include="ModelDto\GCDTransplantDto.cs" />
+    <Compile Include="ModelDto\KPCDTransplantDto.cs" />
+    <Compile Include="ModelDto\GLeakCheckDto.cs" />
+    <Compile Include="ModelDto\KPLeakCheckDto.cs" />
+    <Compile Include="ModelDto\KPSealInstallDto.cs" />
+    <Compile Include="ModelDto\ExhInstallMesDto.cs" />
+    <Compile Include="ModelDto\BurPlugInstallDto.cs" />
+    <Compile Include="ModelDto\OverflowLeakMesDto.cs" />
+    <Compile Include="ModelDto\StaticDiscPressDto.cs" />
+    <Compile Include="ModelDto\GDynStaticMachDto.cs" />
+    <Compile Include="ModelDto\KPDynStaticMachDto.cs" />
+    <Compile Include="ModelDto\GLowVolStartDto.cs" />
+    <Compile Include="ModelDto\KPLowVolStartDto.cs" />
+    <Compile Include="ModelDto\GSpotWeldMachDto.cs" />
+    <Compile Include="ModelDto\KPSpotWeldMachDto.cs" />
+    <Compile Include="ModelDto\GRingWeldMachDto.cs" />
+    <Compile Include="ModelDto\KPRingWeldMachDto.cs" />
+    <Compile Include="ModelDto\GShrinkTubDto.cs" />
+    <Compile Include="ModelDto\GStaticDiskMachDto.cs" />
+    <Compile Include="ModelDto\KPStaticDiskMachDto.cs" />
+    <Compile Include="ModelDto\ValidateModelBase.cs" />
+    <Compile Include="ModelDto\AppearanceTestDto.cs" />
+    <Compile Include="ViewModel\DbDataClearViewModel.cs" />
+    <Compile Include="ViewModel\CylinderEngravViewModel.cs" />
+    <Compile Include="ViewModel\KPRingWeldMachDwViewModel.cs" />
+    <Compile Include="ViewModel\KPRingWeldMachUpViewModel.cs" />
+    <Compile Include="ViewModel\KPShrinkTubViewModel.cs" />
+    <Compile Include="ViewModel\KPUpBurnEbViewModel.cs" />
+    <Compile Include="ViewModel\TermWeldViewModel.cs" />
+    <Compile Include="ViewModel\GCylinderBurnEbViewModel.cs" />
+    <Compile Include="ViewModel\GRotorBurnEbViewModel.cs" />
+    <Compile Include="ViewModel\GRotorMagViewModel.cs" />
+    <Compile Include="ViewModel\GInsRotaResViewModel.cs" />
+    <Compile Include="ViewModel\PRacktPressViewModel.cs" />
+    <Compile Include="ViewModel\PRacktWeldViewModel.cs" />
+    <Compile Include="ViewModel\PLowWeldViewModel.cs" />
+    <Compile Include="ViewModel\PCoreMesViewModel.cs" />
+    <Compile Include="ViewModel\GMagTorqueViewModel.cs" />
+    <Compile Include="ViewModel\KPMagTorqueViewModel.cs" />
+    <Compile Include="ViewModel\GOilPumpInstallViewModel.cs" />
+    <Compile Include="ViewModel\KPOilPumpInstallViewModel.cs" />
+    <Compile Include="ViewModel\GCDTransplantViewModel.cs" />
+    <Compile Include="ViewModel\KPCDTransplantViewModel.cs" />
+    <Compile Include="ViewModel\GLeakCheckViewModel.cs" />
+    <Compile Include="ViewModel\KPLeakCheckViewModel.cs" />
+    <Compile Include="ViewModel\KPSealInstallViewModel.cs" />
+    <Compile Include="ViewModel\ExhInstallMesViewModel.cs" />
+    <Compile Include="ViewModel\BurPlugInstallViewModel.cs" />
+    <Compile Include="ViewModel\OverflowLeakMesViewModel.cs" />
+    <Compile Include="ViewModel\StaticDiscPressViewModel.cs" />
+    <Compile Include="ViewModel\GDynStaticMachViewModel.cs" />
+    <Compile Include="ViewModel\KPDynStaticMachViewModel.cs" />
+    <Compile Include="ViewModel\GLowVolStartViewModel.cs" />
+    <Compile Include="ViewModel\KPLowVolStartViewModel.cs" />
+    <Compile Include="ViewModel\GSpotWeldMachViewModel.cs" />
+    <Compile Include="ViewModel\KPSpotWeldMachViewModel.cs" />
+    <Compile Include="ViewModel\GRingWeldMachViewModel.cs" />
+    <Compile Include="ViewModel\KPRingWeldMachViewModel.cs" />
+    <Compile Include="ViewModel\GShrinkTubViewModel.cs" />
+    <Compile Include="ViewModel\GStaticDiskMachViewModel.cs" />
+    <Compile Include="ViewModel\KPStaticDiskMachViewModel.cs" />
+    <Compile Include="ViewModel\OilPumpInstallViewModel.cs" />
+    <Compile Include="ViewModel\ItemMenu.cs" />
+    <Compile Include="ViewModel\KanBanViewModel.cs" />
+    <Compile Include="ViewModel\MainViewModel.cs" />
+    <Compile Include="ViewModel\OffsetConfigViewModel.cs" />
+    <Compile Include="ViewModel\MagTorqueViewModel.cs" />
+    <Compile Include="ViewModel\ReportTimeConfigViewModel.cs" />
+    <Compile Include="ViewModel\SubItem.cs" />
+    <Compile Include="ViewModel\ViewModelLocator.cs" />
+    <Compile Include="ViewModel\AppearanceTestViewModel.cs" />
+    <Compile Include="View\AppearanceTest\AppearanceTestIndex.xaml.cs">
+      <DependentUpon>AppearanceTestIndex.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\BurPlugInstall\BurPlugInstallView.xaml.cs">
+      <DependentUpon>BurPlugInstallView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\CylinderEngrav\CylinderEngravView.xaml.cs">
+      <DependentUpon>CylinderEngravView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\DbDataClear\DbDataClearView.xaml.cs">
+      <DependentUpon>DbDataClearView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\ExhInstallMes\ExhInstallMesView.xaml.cs">
+      <DependentUpon>ExhInstallMesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GCDTransplant\GCDTransplantView.xaml.cs">
+      <DependentUpon>GCDTransplantView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GCylinderBurnEb\GCylinderBurnEbView.xaml.cs">
+      <DependentUpon>GCylinderBurnEbView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GDynStaticMach\GDynStaticMachView.xaml.cs">
+      <DependentUpon>GDynStaticMachView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GInsRotaRes\GInsRotaResView.xaml.cs">
+      <DependentUpon>GInsRotaResView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GLeakCheck\GLeakCheckView.xaml.cs">
+      <DependentUpon>GLeakCheckView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GLowVolStart\GLowVolStartView.xaml.cs">
+      <DependentUpon>GLowVolStartView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GMagTorque\GMagTorqueView.xaml.cs">
+      <DependentUpon>GMagTorqueView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GOilPumpInstall\GOilPumpInstallView.xaml.cs">
+      <DependentUpon>GOilPumpInstallView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GRingWeldMach\GRingWeldMachView.xaml.cs">
+      <DependentUpon>GRingWeldMachView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GRotorBurnEb\GRotorBurnEbView.xaml.cs">
+      <DependentUpon>GRotorBurnEbView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GRotorMag\GRotorMagView.xaml.cs">
+      <DependentUpon>GRotorMagView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GShrinkTub\GShrinkTubView.xaml.cs">
+      <DependentUpon>GShrinkTubView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GSpotWeldMach\GSpotWeldMachView.xaml.cs">
+      <DependentUpon>GSpotWeldMachView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\GStaticDiskMach\GStaticDiskMachView.xaml.cs">
+      <DependentUpon>GStaticDiskMachView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPCDTransplant\KPCDTransplantView.xaml.cs">
+      <DependentUpon>KPCDTransplantView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPDynStaticMach\KPDynStaticMachView.xaml.cs">
+      <DependentUpon>KPDynStaticMachView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPLeakCheck\KPLeakCheckView.xaml.cs">
+      <DependentUpon>KPLeakCheckView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPLowVolStart\KPLowVolStartView.xaml.cs">
+      <DependentUpon>KPLowVolStartView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPMagTorque\KPMagTorqueView.xaml.cs">
+      <DependentUpon>KPMagTorqueView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPOilPumpInstall\KPOilPumpInstallView.xaml.cs">
+      <DependentUpon>KPOilPumpInstallView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPRingWeldMachDw\KPRingWeldMachDwView.xaml.cs">
+      <DependentUpon>KPRingWeldMachDwView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPRingWeldMachUp\KPRingWeldMachUpView.xaml.cs">
+      <DependentUpon>KPRingWeldMachUpView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPRingWeldMach\KPRingWeldMachView.xaml.cs">
+      <DependentUpon>KPRingWeldMachView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPSealInstall\KPSealInstallView.xaml.cs">
+      <DependentUpon>KPSealInstallView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPShrinkTub\KPShrinkTubView.xaml.cs">
+      <DependentUpon>KPShrinkTubView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPSpotWeldMach\KPSpotWeldMachView.xaml.cs">
+      <DependentUpon>KPSpotWeldMachView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPStaticDiskMach\KPStaticDiskMachView.xaml.cs">
+      <DependentUpon>KPStaticDiskMachView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KPUpBurnEb\KPUpBurnEbView.xaml.cs">
+      <DependentUpon>KPUpBurnEbView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\MagTorque\MagTorqueView.xaml.cs">
+      <DependentUpon>MagTorqueView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\OilPumpInstall\OilPumpInstallView.xaml.cs">
+      <DependentUpon>OilPumpInstallView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KanBan\KanBanIndex.xaml.cs">
+      <DependentUpon>KanBanIndex.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KanBan\KanBan_Create.xaml.cs">
+      <DependentUpon>KanBan_Create.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KanBan\KanBan_PlanCountCreate.xaml.cs">
+      <DependentUpon>KanBan_PlanCountCreate.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KanBan\KanBan_PlanCountUpdate.xaml.cs">
+      <DependentUpon>KanBan_PlanCountUpdate.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\KanBan\KanBan_Update.xaml.cs">
+      <DependentUpon>KanBan_Update.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\MsgInput.xaml.cs">
+      <DependentUpon>MsgInput.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\OffsetConfig\OffsetConfigIndex.xaml.cs">
+      <DependentUpon>OffsetConfigIndex.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\OverflowLeakMes\OverflowLeakMesView.xaml.cs">
+      <DependentUpon>OverflowLeakMesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\PCoreMes\PCoreMesView.xaml.cs">
+      <DependentUpon>PCoreMesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\PLowWeld\PLowWeldView.xaml.cs">
+      <DependentUpon>PLowWeldView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\PRacktPress\PRacktPressView.xaml.cs">
+      <DependentUpon>PRacktPressView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\PRacktWeld\PRacktWeldView.xaml.cs">
+      <DependentUpon>PRacktWeldView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\ReportTimeConfig\ReportTimeConfigIndex.xaml.cs">
+      <DependentUpon>ReportTimeConfigIndex.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\StaticDiscPress\StaticDiscPressView.xaml.cs">
+      <DependentUpon>StaticDiscPressView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\TermWeld\TermWeldView.xaml.cs">
+      <DependentUpon>TermWeldView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="View\UserControlMenuItem.xaml.cs">
+      <DependentUpon>UserControlMenuItem.xaml</DependentUpon>
+    </Compile>
+    <Page Include="Assets\TextBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="View\AppearanceTest\AppearanceTestIndex.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\BurPlugInstall\BurPlugInstallView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\CylinderEngrav\CylinderEngravView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\DbDataClear\DbDataClearView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\ExhInstallMes\ExhInstallMesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GCDTransplant\GCDTransplantView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GCylinderBurnEb\GCylinderBurnEbView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GDynStaticMach\GDynStaticMachView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GInsRotaRes\GInsRotaResView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GLeakCheck\GLeakCheckView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GLowVolStart\GLowVolStartView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GMagTorque\GMagTorqueView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GOilPumpInstall\GOilPumpInstallView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GRingWeldMach\GRingWeldMachView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GRotorBurnEb\GRotorBurnEbView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GRotorMag\GRotorMagView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GShrinkTub\GShrinkTubView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GSpotWeldMach\GSpotWeldMachView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\GStaticDiskMach\GStaticDiskMachView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPCDTransplant\KPCDTransplantView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPDynStaticMach\KPDynStaticMachView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPLeakCheck\KPLeakCheckView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPLowVolStart\KPLowVolStartView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPMagTorque\KPMagTorqueView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPOilPumpInstall\KPOilPumpInstallView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPRingWeldMachDw\KPRingWeldMachDwView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPRingWeldMachUp\KPRingWeldMachUpView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPRingWeldMach\KPRingWeldMachView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPSealInstall\KPSealInstallView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPShrinkTub\KPShrinkTubView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPSpotWeldMach\KPSpotWeldMachView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPStaticDiskMach\KPStaticDiskMachView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KPUpBurnEb\KPUpBurnEbView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\MagTorque\MagTorqueView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\OilPumpInstall\OilPumpInstallView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KanBan\KanBanIndex.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KanBan\KanBan_Create.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KanBan\KanBan_PlanCountCreate.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KanBan\KanBan_PlanCountUpdate.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\KanBan\KanBan_Update.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\MsgInput.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\OffsetConfig\OffsetConfigIndex.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\OverflowLeakMes\OverflowLeakMesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\PCoreMes\PCoreMesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\PLowWeld\PLowWeldView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\PRacktPress\PRacktPressView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\PRacktWeld\PRacktWeldView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\ReportTimeConfig\ReportTimeConfigIndex.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\StaticDiscPress\StaticDiscPressView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\TermWeld\TermWeldView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="View\UserControlMenuItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <Content Include="NLog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <None Include="NLog.xsd">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <None Include="ReportFile\AppearanceTestTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\BurPlugInstallTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\CylinderEngravTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\ExhInstallMesTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GCDTransplantTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GCylinderBurnEbTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GDynStaticMachTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GInsRotaResTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GLeakCheckTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GLowVolStartTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GMagTorqueTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GOilPumpInstallTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GRingWeldMachTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GRotorBurnEbTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GRotorMagTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GShrinkTubTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GSpotWeldMachTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\GStaticDiskMachTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPCDTransplantTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPDynStaticMachTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPLeakCheckTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPLowVolStartTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPMagTorqueTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPOilPumpInstallTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPRingWeldMachDwTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPRingWeldMachTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPRingWeldMachUpTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPSealInstallTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPShrinkTubTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPSpotWeldMachTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPStaticDiskMachTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\KPUpBurnEbTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\OilPumpInstallTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\MagTorqueTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\OverflowLeakMesTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\PCoreMesTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\PlaquePrintTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\PLowWeldTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\PRacktPressTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\PRacktWeldTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\StaticDiscPressTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="ReportFile\TermWeldTemplate.xlsx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GroupLine.Com\GroupLine.Com.csproj">
+      <Project>{d952eff3-e90d-48ce-92e5-76e1ba4ab609}</Project>
+      <Name>GroupLine.Com</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\GroupLine.Model\GroupLine.Model.csproj">
+      <Project>{7b3ac8e7-3cda-4d30-8d65-42092aa62bb9}</Project>
+      <Name>GroupLine.Model</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\logo.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\P0.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\MaterialDesignThemes.4.1.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.4.1.0\build\MaterialDesignThemes.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\MaterialDesignThemes.4.1.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.4.1.0\build\MaterialDesignThemes.targets'))" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/GroupLine.App/Images/P0.ico b/GroupLine.App/Images/P0.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f8e93e24bad880ccaa3fc758814a90398acffef9
GIT binary patch
literal 67646
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
Q=CzB+(pb}<8}aA=1HrPQQ2+n{

literal 0
HcmV?d00001

diff --git a/GroupLine.App/Images/logo.png b/GroupLine.App/Images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ba11bc018a7a5540c9c272dd8d9bc801a70889c
GIT binary patch
literal 5629
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
XI;}qX-n+@@00000NkvXXu0mjfS~~+!

literal 0
HcmV?d00001

diff --git a/GroupLine.App/MainWindow.xaml b/GroupLine.App/MainWindow.xaml
new file mode 100644
index 0000000..80d57b6
--- /dev/null
+++ b/GroupLine.App/MainWindow.xaml
@@ -0,0 +1,74 @@
+<Window
+    x:Class="GroupLine.App.MainWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="GroupLine产线管理系统"
+    Width="1600"
+    Height="900"
+    Background="{DynamicResource MaterialDesignBackground}"
+    Closed="Window_Closed"
+    FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
+    Foreground="{DynamicResource MaterialDesignBody}"
+    Icon="Images/P0.ico"
+    WindowStartupLocation="CenterScreen"
+    WindowState="Maximized"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="250" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <materialDesign:ColorZone
+            Grid.ColumnSpan="2"
+            HorizontalAlignment="Stretch"
+            Mode="PrimaryMid">
+            <Grid>
+                <Label
+                    Name="LabelTitle"
+                    Padding="20"
+                    FontSize="26"
+                    Foreground="White">
+                    DAIKIN-GroupLine生产管理系统
+                </Label>
+                <materialDesign:PopupBox
+                    Margin="10"
+                    HorizontalAlignment="Right"
+                    PlacementMode="BottomAndAlignRightEdges" />
+            </Grid>
+        </materialDesign:ColorZone>
+        <Grid
+            Grid.Row="1"
+            HorizontalAlignment="Stretch"
+            Background="{StaticResource PrimaryHueMidBrush}">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="70" />
+                <RowDefinition Height="326*" />
+            </Grid.RowDefinitions>
+            <Grid Grid.Row="0" Background="GhostWhite">
+                <Image Source="Images/logo.png" />
+            </Grid>
+            <ScrollViewer
+                Grid.Row="1"
+                HorizontalAlignment="Stretch"
+                HorizontalScrollBarVisibility="Disabled"
+                VerticalScrollBarVisibility="Auto">
+                <StackPanel x:Name="Menu" Margin="10" />
+            </ScrollViewer>
+        </Grid>
+        <StackPanel
+            x:Name="StackPanelMain"
+            Grid.Row="1"
+            Grid.Column="1"
+            HorizontalAlignment="Stretch" />
+
+    </Grid>
+</Window>
diff --git a/GroupLine.App/MainWindow.xaml.cs b/GroupLine.App/MainWindow.xaml.cs
new file mode 100644
index 0000000..dde5ca4
--- /dev/null
+++ b/GroupLine.App/MainWindow.xaml.cs
@@ -0,0 +1,254 @@
+using GroupLine.App.View;
+using GroupLine.App.View.AppearanceTest;
+using GroupLine.App.View.MagTorque;
+using GroupLine.App.View.KanBan;
+using GroupLine.App.View.OffsetConfig;
+using GroupLine.App.ViewModel;
+using GroupLine.Com;
+using GroupLine.Model;
+using MaterialDesignThemes.Wpf;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Windows;
+using System.Windows.Controls;
+using YC5.App.View.DbDataClear;
+using YC5.App.View.OilPumpInstall;
+using GroupLine.App.View.BurPlugInstall;
+using GroupLine.App.View.CylinderEngrav;
+using GroupLine.App.View.ExhInstallMes;
+using GroupLine.App.View.GCDTransplant;
+using GroupLine.App.View.GCylinderBurnEb;
+using GroupLine.App.View.GDynStaticMach;
+using GroupLine.App.View.GInsRotaRes;
+using GroupLine.App.View.GLeakCheck;
+using GroupLine.App.View.GLowVolStart;
+using GroupLine.App.View.GMagTorque;
+using GroupLine.App.View.GOilPumpInstall;
+using GroupLine.App.View.GRingWeldMach;
+using GroupLine.App.View.GRotorBurnEb;
+using GroupLine.App.View.GRotorMag;
+using GroupLine.App.View.GShrinkTub;
+using GroupLine.App.View.GSpotWeldMach;
+using GroupLine.App.View.GStaticDiskMach;
+using GroupLine.App.View.KPCDTransplant;
+using GroupLine.App.View.KPDynStaticMach;
+using GroupLine.App.View.KPLeakCheck;
+using GroupLine.App.View.KPLowVolStart;
+using GroupLine.App.View.KPMagTorque;
+using GroupLine.App.View.KPOilPumpInstall;
+using GroupLine.App.View.KPRingWeldMach;
+using GroupLine.App.View.KPSealInstall;
+using GroupLine.App.View.KPSpotWeldMach;
+using GroupLine.App.View.KPStaticDiskMach;
+using GroupLine.App.View.OverflowLeakMes;
+using GroupLine.App.View.PCoreMes;
+using GroupLine.App.View.PLowWeld;
+using GroupLine.App.View.PRacktPress;
+using GroupLine.App.View.PRacktWeld;
+using GroupLine.App.View.StaticDiscPress;
+using GroupLine.App.View.TermWeld;
+using GroupLine.App.View.KPUpBurnEb;
+using GroupLine.App.View.KPRingWeldMachDw;
+using GroupLine.App.View.KPRingWeldMachUp;
+using GroupLine.App.View.KPShrinkTub;
+
+namespace GroupLine.App
+{
+    /// <summary>
+    /// MainWindow.xaml 的交互逻辑
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        /// <summary>
+        /// 报表定时导出监听线程
+        /// </summary>
+        private Thread ReportListenThread;
+
+        /// <summary>
+        /// 报表导出时间字符串
+        /// </summary>
+        private string ReportOutPutTime = "12:01";
+
+
+
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        //FSQL实例
+        static IFreeSql Fsql;
+
+        /// <summary>
+        /// 当前程序的位置
+        /// </summary>
+        private string Location;
+
+        /// <summary>
+        /// 当前配置信息区域
+        /// </summary>
+        private string CurrentRegion = "SCR组立";
+
+        /// <summary>
+        /// 当前配置的分类
+        /// </summary>
+        private string CurrentCategory = "报表信息";
+
+        /// <summary>
+        /// 当前的报表导出的时间
+        /// </summary>
+        private string CurrentReportTimeName = "导出时间";
+
+        public MainWindow()
+        {
+            InitializeComponent();
+
+
+            ReportTimeConfigViewModel.PubReportTimeEvent += ReportTimeConfigViewModel_PubReportTimeEvent;
+
+            //获取程序的配置信息
+            var SqlCon = ConfigHelper.GetValue("connecting");
+
+            Fsql = new FreeSql.FreeSqlBuilder()
+                 .UseConnectionString(FreeSql.DataType.SqlServer, SqlCon)
+                 .UseAutoSyncStructure(true) //自动同步实体结构到数据库
+                 .Build(); //请务必定义成 Singleton 单例模式
+
+            var menuReports = new List<SubItem>();
+            var DeviceGroup = new List<SubItem>();
+
+            CurrentRegion = "GroupLine";
+            this.Title = "GroupLine产线管理系统";
+            this.LabelTitle.Content = "DAIKIN-GroupLine生产管理系统";
+
+
+            var item3 = new ItemMenu("设备数据", DeviceGroup, PackIconKind.CogOutline);
+
+
+            //DeviceGroup.Add(new SubItem("铭板打印", new PlaquePrintIndex()));
+            //DeviceGroup.Add(new SubItem("外观检查", new AppearanceTestIndex()));
+            DeviceGroup.Add(new SubItem("G型磁束扭矩检", new MagTorqueView()));
+            DeviceGroup.Add(new SubItem("G型油泵安装", new OilPumpInstallView()));
+            DeviceGroup.Add(new SubItem("筒体刻印机", new CylinderEngravView()));
+            DeviceGroup.Add(new SubItem("端子凸焊", new TermWeldView()));
+            DeviceGroup.Add(new SubItem("G型筒体烧嵌", new GCylinderBurnEbView()));
+            DeviceGroup.Add(new SubItem("G型转子烧嵌", new GRotorBurnEbView()));
+            DeviceGroup.Add(new SubItem("G型转子着磁", new GRotorMagView()));
+            DeviceGroup.Add(new SubItem("G型绝缘、回转方向、电阻测量", new GInsRotaResView()));
+            DeviceGroup.Add(new SubItem("小P支架压入", new PRacktPressView()));
+            DeviceGroup.Add(new SubItem("小P支架焊接", new PRacktWeldView()));
+            DeviceGroup.Add(new SubItem("小P下部焊接", new PLowWeldView()));
+            DeviceGroup.Add(new SubItem("小P芯出测定", new PCoreMesView()));
+            //DeviceGroup.Add(new SubItem("G型磁束扭矩检测工位", new GMagTorqueView()));
+            DeviceGroup.Add(new SubItem("K / P型磁束扭矩检测工位", new KPMagTorqueView()));
+            //DeviceGroup.Add(new SubItem("G型油泵安装工位", new GOilPumpInstallView()));
+            DeviceGroup.Add(new SubItem("K / P型油泵安装工位", new KPOilPumpInstallView()));
+            DeviceGroup.Add(new SubItem("G型C - D移栽", new GCDTransplantView()));
+            DeviceGroup.Add(new SubItem("K / P型C - D移栽", new KPCDTransplantView()));
+            DeviceGroup.Add(new SubItem("G型高低压泄露检查", new GLeakCheckView()));
+            DeviceGroup.Add(new SubItem("K / P型高低压泄露检查", new KPLeakCheckView()));
+            DeviceGroup.Add(new SubItem("K / P型密封盖板安装", new KPSealInstallView()));
+            DeviceGroup.Add(new SubItem("排气盖板安装气密检测", new ExhInstallMesView()));
+            DeviceGroup.Add(new SubItem("埋塞敲入螺旋钉安装", new BurPlugInstallView()));
+            DeviceGroup.Add(new SubItem("溢流阀安装泄露检查", new OverflowLeakMesView()));
+            DeviceGroup.Add(new SubItem("静盘注液阀压入", new StaticDiscPressView()));
+            DeviceGroup.Add(new SubItem("G型动静盘组装机", new GDynStaticMachView()));
+            DeviceGroup.Add(new SubItem("K / P型动静盘组装机", new KPDynStaticMachView()));
+            DeviceGroup.Add(new SubItem("G型低电压启动", new GLowVolStartView()));
+            DeviceGroup.Add(new SubItem("K / P型低电压启动", new KPLowVolStartView()));
+            DeviceGroup.Add(new SubItem("G型点焊机", new GSpotWeldMachView()));
+            DeviceGroup.Add(new SubItem("K / P点焊机", new KPSpotWeldMachView()));
+            DeviceGroup.Add(new SubItem("G型环焊机底部焊接", new GRingWeldMachView()));
+            DeviceGroup.Add(new SubItem("G型环焊机顶部焊接", new KPRingWeldMachView()));
+            DeviceGroup.Add(new SubItem("G型缩管", new GShrinkTubView())); 
+            DeviceGroup.Add(new SubItem("K / P上配重烧嵌", new KPUpBurnEbView()));
+            DeviceGroup.Add(new SubItem("G型静盘组装机", new GStaticDiskMachView()));
+            DeviceGroup.Add(new SubItem("K / P静盘组装机", new KPStaticDiskMachView()));
+            DeviceGroup.Add(new SubItem("K/P型环焊机底部焊接", new KPRingWeldMachDwView()));
+            DeviceGroup.Add(new SubItem("K/P型环焊机顶部焊接", new KPRingWeldMachUpView()));
+            DeviceGroup.Add(new SubItem("K/P型缩管", new KPShrinkTubView()));
+
+
+            var menuKanban = new List<SubItem>();
+            menuKanban.Add(new SubItem("休息时间设置", new KanBanIndex()));
+            menuKanban.Add(new SubItem("偏置设置", new OffsetConfigIndex()));
+            menuKanban.Add(new SubItem("数据备份", new DbDataClearView()));
+            //menuKanban.Add(new SubItem("稼动率报表", new ProductRateIndex()));
+            //menuKanban.Add(new SubItem("帮助"));
+            var item5 = new ItemMenu("配置", menuKanban, PackIconKind.MonitorDashboard);
+
+            var menuSystemConfig = new List<SubItem>();
+            menuSystemConfig.Add(new SubItem("帮助"));
+            var item4 = new ItemMenu("系统设置", menuSystemConfig, PackIconKind.ViewDashboard);
+
+            //MonitorDashboard ClipboardTextPlayOutline
+
+            //var menuUser = new List<SubItem>();
+            //menuUser.Add(new SubItem("用户管理"));
+            //var item5 = new ItemMenu("用户设置", menuUser, PackIconKind.User);
+
+            //var item0 = new ItemMenu("看板中心", new null, PackIconKind.ViewDashboard);
+
+            //Menu.Children.Add(new UserControlMenuItem(item0, this));
+            //Menu.Children.Add(new UserControlMenuItem(item1, this));
+            Menu.Children.Add(new UserControlMenuItem(item3, this));
+            Menu.Children.Add(new UserControlMenuItem(item5, this));
+            Menu.Children.Add(new UserControlMenuItem(item4, this));
+            //Menu.Children.Add(new UserControlMenuItem(item5, this));
+
+
+
+            var ConfigInfo = Fsql.Select<SystemConfig>().Where(a => a.Region == CurrentRegion && a.Category == CurrentCategory && a.Name == CurrentReportTimeName).ToList();
+            if (ConfigInfo != null && ConfigInfo.Count() > 0)
+            {
+                ReportOutPutTime = ConfigInfo.FirstOrDefault().Value;
+            }
+            else
+            {
+                ReportOutPutTime = "12:01";
+            }
+
+            ReportListenThread = new Thread(new ThreadStart(ReportListenThreadMethod));
+            ReportListenThread.Start();
+
+        }
+
+        private void ReportListenThreadMethod()
+        {
+
+        }
+
+        /// <summary>
+        /// 修改了报表信息数据
+        /// </summary>
+        /// <param name="ReportInfo"></param>
+        private void ReportTimeConfigViewModel_PubReportTimeEvent(string ReportInfo)
+        {
+            ReportOutPutTime = ReportInfo;
+        }
+
+        /// <summary>
+        /// 切换窗体
+        /// </summary>
+        /// <param name="sender"></param>
+        internal void SwitchScreen(object sender)
+        {
+
+            var screen = ((UserControl)sender);
+
+            if (screen != null)
+            {
+                StackPanelMain.Children.Clear();
+                StackPanelMain.Children.Add(screen);
+            }
+
+
+        }
+
+        private void Window_Closed(object sender, EventArgs e)
+        {
+            Environment.Exit(0);
+        }
+    }
+}
diff --git a/GroupLine.App/ModelDto/AppearanceTestDto.cs b/GroupLine.App/ModelDto/AppearanceTestDto.cs
new file mode 100644
index 0000000..77139ef
--- /dev/null
+++ b/GroupLine.App/ModelDto/AppearanceTestDto.cs
@@ -0,0 +1,223 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(AppearanceTestDto))]
+    public class AppearanceTestDto : ValidateModelBase
+    {
+
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+
+        private string _PlaqueNo;
+        /// <summary>
+        /// 压缩机铭板号
+        /// </summary>
+        public string PlaqueNo
+        {
+            get { return _PlaqueNo; }
+            set { _PlaqueNo = value; RaisePropertyChanged(() => PlaqueNo); }
+        }
+        private string _ProLineNo;
+        /// <summary>
+        /// 生产线号
+        /// </summary>
+        public string ProLineNo
+        {
+            get { return _ProLineNo; }
+            set { _ProLineNo = value; RaisePropertyChanged(() => ProLineNo); }
+        }
+        private string _MachineTypeCheck;
+        /// <summary>
+        /// 机种确认
+        /// </summary>
+        public string MachineTypeCheck
+        {
+            get { return _MachineTypeCheck; }
+            set { _MachineTypeCheck = value; RaisePropertyChanged(() => MachineTypeCheck); }
+        }
+        private string _PlaqueCheck;
+        /// <summary>
+        /// 铭板确认
+        /// </summary>
+        public string PlaqueCheck
+        {
+            get { return _PlaqueCheck; }
+            set { _PlaqueCheck = value; RaisePropertyChanged(() => PlaqueCheck); }
+        }
+        private string _TerminalCheck;
+        /// <summary>
+        /// 端子确认
+        /// </summary>
+        public string TerminalCheck
+        {
+            get { return _TerminalCheck; }
+            set { _TerminalCheck = value; RaisePropertyChanged(() => TerminalCheck); }
+        }
+        private string _ElectricalBoxCheck;
+        /// <summary>
+        /// 电器盒确认
+        /// </summary>
+        public string ElectricalBoxCheck
+        {
+            get { return _ElectricalBoxCheck; }
+            set { _ElectricalBoxCheck = value; RaisePropertyChanged(() => ElectricalBoxCheck); }
+        }
+        private string _SealingPlugCheck;
+        /// <summary>
+        /// 密封塞确认
+        /// </summary>
+        public string SealingPlugCheck
+        {
+            get { return _SealingPlugCheck; }
+            set { _SealingPlugCheck = value; RaisePropertyChanged(() => SealingPlugCheck); }
+        }
+        private string _InOutTubeCheck;
+        /// <summary>
+        /// 吸入管吐出管确认
+        /// </summary>
+        public string InOutTubeCheck
+        {
+            get { return _InOutTubeCheck; }
+            set { _InOutTubeCheck = value; RaisePropertyChanged(() => InOutTubeCheck); }
+        }
+        private string _UpperCoverCheck;
+        /// <summary>
+        /// 上外罩确认
+        /// </summary>
+        public string UpperCoverCheck
+        {
+            get { return _UpperCoverCheck; }
+            set { _UpperCoverCheck = value; RaisePropertyChanged(() => UpperCoverCheck); }
+        }
+        private string _ReservoirCheck;
+        /// <summary>
+        /// 储液器确认
+        /// </summary>
+        public string ReservoirCheck
+        {
+            get { return _ReservoirCheck; }
+            set { _ReservoirCheck = value; RaisePropertyChanged(() => ReservoirCheck); }
+        }
+        private string _HandTubeCheck;
+        /// <summary>
+        /// 继手管确认
+        /// </summary>
+        public string HandTubeCheck
+        {
+            get { return _HandTubeCheck; }
+            set { _HandTubeCheck = value; RaisePropertyChanged(() => HandTubeCheck); }
+        }
+        private string _WeldCheck;
+        /// <summary>
+        /// 点焊确认
+        /// </summary>
+        public string WeldCheck
+        {
+            get { return _WeldCheck; }
+            set { _WeldCheck = value; RaisePropertyChanged(() => WeldCheck); }
+        }
+        private string _PaintCheck;
+        /// <summary>
+        /// 涂装确认
+        /// </summary>
+        public string PaintCheck
+        {
+            get { return _PaintCheck; }
+            set { _PaintCheck = value; RaisePropertyChanged(() => PaintCheck); }
+        }
+        private string _LiftLugCheck;
+        /// <summary>
+        /// 吊耳确认
+        /// </summary>
+        public string LiftLugCheck
+        {
+            get { return _LiftLugCheck; }
+            set { _LiftLugCheck = value; RaisePropertyChanged(() => LiftLugCheck); }
+        }
+        private string _GirthWeldCheck;
+        /// <summary>
+        /// 环焊确认
+        /// </summary>
+        public string GirthWeldCheck
+        {
+            get { return _GirthWeldCheck; }
+            set { _GirthWeldCheck = value; RaisePropertyChanged(() => GirthWeldCheck); }
+        }
+        private string _WeldSlagCheck;
+        /// <summary>
+        /// 焊渣确认
+        /// </summary>
+        public string WeldSlagCheck
+        {
+            get { return _WeldSlagCheck; }
+            set { _WeldSlagCheck = value; RaisePropertyChanged(() => WeldSlagCheck); }
+        }
+        private string _FastenLeatherPadCheck;
+        /// <summary>
+        /// 紧固环皮垫确认
+        /// </summary>
+        public string FastenLeatherPadCheck
+        {
+            get { return _FastenLeatherPadCheck; }
+            set { _FastenLeatherPadCheck = value; RaisePropertyChanged(() => FastenLeatherPadCheck); }
+        }
+        private string _CylinderCheck;
+        /// <summary>
+        /// 筒体确认
+        /// </summary>
+        public string CylinderCheck
+        {
+            get { return _CylinderCheck; }
+            set { _CylinderCheck = value; RaisePropertyChanged(() => CylinderCheck); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 外观检查结果
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private string _OperationNo;
+        /// <summary>
+        /// 测试人员工号
+        /// </summary>
+        public string OperationNo
+        {
+            get { return _OperationNo; }
+            set { _OperationNo = value; RaisePropertyChanged(() => OperationNo); }
+        }
+
+
+
+
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set
+            {
+                _CreateTime = value;
+                RaisePropertyChanged(() => CreateTime);
+            }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/BurPlugInstallDto.cs b/GroupLine.App/ModelDto/BurPlugInstallDto.cs
new file mode 100644
index 0000000..35e0b2a
--- /dev/null
+++ b/GroupLine.App/ModelDto/BurPlugInstallDto.cs
@@ -0,0 +1,130 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(BurPlugInstallDto))]
+    public class BurPlugInstallDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _StaticDiskNo;
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        public string StaticDiskNo
+        {
+            get { return _StaticDiskNo; }
+            set { _StaticDiskNo = value; RaisePropertyChanged(() => StaticDiskNo); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+
+
+        private string _SpiralScrewCheck;
+        /// <summary>
+        /// 螺旋螺钉判定
+        /// </summary>
+        public string SpiralScrewCheck
+        {
+            get { return _SpiralScrewCheck; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _SpiralScrewCheck = "OK";
+                        break;
+                    case "2":
+                        _SpiralScrewCheck = "NG";
+                        break;
+                    default:
+                        _SpiralScrewCheck = "不做";
+                        break;
+                }
+                _SpiralScrewCheck = value;
+                RaisePropertyChanged(() => SpiralScrewCheck);
+            }
+        }
+
+
+        private string _StaDycDiskCheck;
+        /// <summary>
+        /// 动静盘埋塞判定
+        /// </summary>
+        public string StaDycDiskCheck
+        {
+            get { return _StaDycDiskCheck; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _StaDycDiskCheck = "OK";
+                        break;
+                    case "2":
+                        _StaDycDiskCheck = "NG";
+                        break;
+                    default:
+                        _StaDycDiskCheck = "不做";
+                        break;
+                }
+                _StaDycDiskCheck = value;
+                RaisePropertyChanged(() => StaDycDiskCheck);
+            }
+        }
+
+        private string _CoverPlugCheck;
+        /// <summary>
+        /// 盖板埋塞判定
+        /// </summary>
+        public string CoverPlugCheck
+        {
+            get { return _CoverPlugCheck; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _CoverPlugCheck = "OK";
+                        break;
+                    case "2":
+                        _CoverPlugCheck = "NG";
+                        break;
+                    default:
+                        _CoverPlugCheck = "不做";
+                        break;
+                }
+                _CoverPlugCheck = value; RaisePropertyChanged(() => CoverPlugCheck);
+            }
+        }
+
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/ComboBoxModel.cs b/GroupLine.App/ModelDto/ComboBoxModel.cs
new file mode 100644
index 0000000..37c6cb7
--- /dev/null
+++ b/GroupLine.App/ModelDto/ComboBoxModel.cs
@@ -0,0 +1,30 @@
+using GalaSoft.MvvmLight;
+using System;
+
+namespace GroupLine.App.ModelDto
+{
+    public class ComboBoxModel : ObservableObject
+    {
+        private String key;
+        /// <summary>
+        /// Key值
+        /// </summary>
+        public String Key
+        {
+            get { return key; }
+            set { key = value; RaisePropertyChanged(() => Key); }
+        }
+
+
+        private String text;
+        /// <summary>
+        /// Text值
+        /// </summary>
+        public String Text
+        {
+            get { return text; }
+            set { text = value; RaisePropertyChanged(() => Text); }
+        }
+    }
+
+}
diff --git a/GroupLine.App/ModelDto/CylinderEngravDto.cs b/GroupLine.App/ModelDto/CylinderEngravDto.cs
new file mode 100644
index 0000000..493694c
--- /dev/null
+++ b/GroupLine.App/ModelDto/CylinderEngravDto.cs
@@ -0,0 +1,50 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(CylinderEngravDto))]
+    public class CylinderEngravDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/ExhInstallMesDto.cs b/GroupLine.App/ModelDto/ExhInstallMesDto.cs
new file mode 100644
index 0000000..8d7e1ef
--- /dev/null
+++ b/GroupLine.App/ModelDto/ExhInstallMesDto.cs
@@ -0,0 +1,340 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(ExhInstallMesDto))]
+    public class ExhInstallMesDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _MachineCode;
+        /// <summary>
+        /// 机型
+        /// </summary>
+        public string MachineCode
+        {
+            get { return _MachineCode; }
+            set { _MachineCode = value; RaisePropertyChanged(() => _MachineCode); }
+        }
+
+        private string _StaticDiskNo;
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        public string StaticDiskNo
+        {
+            get { return _StaticDiskNo; }
+            set { _StaticDiskNo = value; RaisePropertyChanged(() => StaticDiskNo); }
+        }
+
+        private string _DynaDiskNo;
+        /// <summary>
+        /// 动盘编号
+        /// </summary>
+        public string DynaDiskNo
+        {
+            get { return _DynaDiskNo; }
+            set { _DynaDiskNo = value; RaisePropertyChanged(() => _DynaDiskNo); }
+        }
+
+
+        private decimal _Cycle;
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        public decimal Cycle
+        {
+            get { return _Cycle; }
+            set { _Cycle = value; RaisePropertyChanged(() => Cycle); }
+        }
+
+        private int _ScrewCount;
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        public int ScrewCount
+        {
+            get { return _ScrewCount; }
+            set { _ScrewCount = value; RaisePropertyChanged(() => ScrewCount); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private decimal _ExhausTorque;
+        /// <summary>
+        /// 排气盖板扭矩
+        /// </summary>
+        public decimal ExhausTorque
+        {
+            get { return _ExhausTorque; }
+            set { _ExhausTorque = value; RaisePropertyChanged(() => ExhausTorque); }
+        }
+        private decimal _FinalAngle;
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        public decimal FinalAngle
+        {
+            get { return _FinalAngle; }
+            set { _FinalAngle = value; RaisePropertyChanged(() => FinalAngle); }
+        }
+
+        private decimal _ExhausTorque2;
+        /// <summary>
+        /// 排气盖板扭矩2
+        /// </summary>
+        public decimal ExhausTorque2
+        {
+            get { return _ExhausTorque2; }
+            set { _ExhausTorque2 = value; RaisePropertyChanged(() => ExhausTorque2); }
+        }
+        private decimal _FinalAngle2;
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        public decimal FinalAngle2
+        {
+            get { return _FinalAngle2; }
+            set { _FinalAngle2 = value; RaisePropertyChanged(() => FinalAngle2); }
+        }
+
+        private decimal _ExhausTorque3;
+        /// <summary>
+        /// 排气盖板扭矩3
+        /// </summary>
+        public decimal ExhausTorque3
+        {
+            get { return _ExhausTorque3; }
+            set { _ExhausTorque3 = value; RaisePropertyChanged(() => ExhausTorque3); }
+        }
+        private decimal _FinalAngle3;
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        public decimal FinalAngle3
+        {
+            get { return _FinalAngle3; }
+            set { _FinalAngle3 = value; RaisePropertyChanged(() => FinalAngle3); }
+        }
+
+
+
+        private decimal _ExhausTorque4;
+        /// <summary>
+        /// 排气盖板扭矩4
+        /// </summary>
+        public decimal ExhausTorque4
+        {
+            get { return _ExhausTorque4; }
+            set { _ExhausTorque4 = value; RaisePropertyChanged(() => ExhausTorque4); }
+        }
+        private decimal _FinalAngle4;
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        public decimal FinalAngle4
+        {
+            get { return _FinalAngle4; }
+            set { _FinalAngle4 = value; RaisePropertyChanged(() => FinalAngle4); }
+        }
+
+
+        private decimal _ExhausTorque5;
+        /// <summary>
+        /// 排气盖板扭矩5
+        /// </summary>
+        public decimal ExhausTorque5
+        {
+            get { return _ExhausTorque5; }
+            set { _ExhausTorque5 = value; RaisePropertyChanged(() => ExhausTorque5); }
+        }
+        private decimal _FinalAngle5;
+        /// <summary>
+        /// 最终角度5
+        /// </summary>
+        public decimal FinalAngle5
+        {
+            get { return _FinalAngle5; }
+            set { _FinalAngle5 = value; RaisePropertyChanged(() => FinalAngle5); }
+        }
+
+
+        private decimal _ExhausTorque6;
+        /// <summary>
+        /// 排气盖板扭矩6
+        /// </summary>
+        public decimal ExhausTorque6
+        {
+            get { return _ExhausTorque6; }
+            set { _ExhausTorque6 = value; RaisePropertyChanged(() => ExhausTorque6); }
+        }
+        private decimal _FinalAngle6;
+        /// <summary>
+        /// 最终角度6
+        /// </summary>
+        public decimal FinalAngle6
+        {
+            get { return _FinalAngle6; }
+            set { _FinalAngle6 = value; RaisePropertyChanged(() => FinalAngle6); }
+        }
+
+
+        private decimal _ExhausTorque7;
+        /// <summary>
+        /// 排气盖板扭矩7
+        /// </summary>
+        public decimal ExhausTorque7
+        {
+            get { return _ExhausTorque7; }
+            set { _ExhausTorque7 = value; RaisePropertyChanged(() => ExhausTorque7); }
+        }
+        private decimal _FinalAngle7;
+        /// <summary>
+        /// 最终角度7
+        /// </summary>
+        public decimal FinalAngle7
+        {
+            get { return _FinalAngle7; }
+            set { _FinalAngle7 = value; RaisePropertyChanged(() => FinalAngle7); }
+        }
+
+
+        private decimal _ExhausTorque8;
+        /// <summary>
+        /// 排气盖板扭矩8
+        /// </summary>
+        public decimal ExhausTorque8
+        {
+            get { return _ExhausTorque8; }
+            set { _ExhausTorque8 = value; RaisePropertyChanged(() => ExhausTorque8); }
+        }
+        private decimal _FinalAngle8;
+        /// <summary>
+        /// 最终角度8
+        /// </summary>
+        public decimal FinalAngle8
+        {
+            get { return _FinalAngle8; }
+            set { _FinalAngle8 = value; RaisePropertyChanged(() => FinalAngle8); }
+        }
+
+
+        private decimal _ExhausTorque9;
+        /// <summary>
+        /// 排气盖板扭矩9
+        /// </summary>
+        public decimal ExhausTorque9
+        {
+            get { return _ExhausTorque9; }
+            set { _ExhausTorque9 = value; RaisePropertyChanged(() => ExhausTorque9); }
+        }
+        private decimal _FinalAngle9;
+        /// <summary>
+        /// 最终角度9
+        /// </summary>
+        public decimal FinalAngle9
+        {
+            get { return _FinalAngle9; }
+            set { _FinalAngle9 = value; RaisePropertyChanged(() => FinalAngle9); }
+        }
+
+
+        private decimal _ExhausTorque10;
+        /// <summary>
+        /// 排气盖板扭矩10
+        /// </summary>
+        public decimal ExhausTorque10
+        {
+            get { return _ExhausTorque10; }
+            set { _ExhausTorque10 = value; RaisePropertyChanged(() => ExhausTorque10); }
+        }
+        private decimal _FinalAngle10;
+        /// <summary>
+        /// 最终角度10
+        /// </summary>
+        public decimal FinalAngle10
+        {
+            get { return _FinalAngle10; }
+            set { _FinalAngle10 = value; RaisePropertyChanged(() => FinalAngle10); }
+        }
+
+
+        private decimal _ExhausTorque11;
+        /// <summary>
+        /// 排气盖板扭矩11
+        /// </summary>
+        public decimal ExhausTorque11
+        {
+            get { return _ExhausTorque11; }
+            set { _ExhausTorque11 = value; RaisePropertyChanged(() => ExhausTorque11); }
+        }
+        private decimal _FinalAngle11;
+        /// <summary>
+        /// 最终角度11
+        /// </summary>
+        public decimal FinalAngle11
+        {
+            get { return _FinalAngle11; }
+            set { _FinalAngle11 = value; RaisePropertyChanged(() => FinalAngle11); }
+        }
+
+
+        private decimal _ExhausTorque12;
+        /// <summary>
+        /// 排气盖板扭矩12
+        /// </summary>
+        public decimal ExhausTorque12
+        {
+            get { return _ExhausTorque12; }
+            set { _ExhausTorque12 = value; RaisePropertyChanged(() => ExhausTorque12); }
+        }
+        private decimal _FinalAngle12;
+        /// <summary>
+        /// 最终角度12
+        /// </summary>
+        public decimal FinalAngle12
+        {
+            get { return _FinalAngle12; }
+            set { _FinalAngle12 = value; RaisePropertyChanged(() => FinalAngle12); }
+        }
+
+
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GCDTransplantDto.cs b/GroupLine.App/ModelDto/GCDTransplantDto.cs
new file mode 100644
index 0000000..963f413
--- /dev/null
+++ b/GroupLine.App/ModelDto/GCDTransplantDto.cs
@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GCDTransplantDto))]
+    public class GCDTransplantDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GCylinderBurnEbDto.cs b/GroupLine.App/ModelDto/GCylinderBurnEbDto.cs
new file mode 100644
index 0000000..150fd21
--- /dev/null
+++ b/GroupLine.App/ModelDto/GCylinderBurnEbDto.cs
@@ -0,0 +1,77 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GCylinderBurnEbDto))]
+    public class GCylinderBurnEbDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private string  _StatoNo;
+        /// <summary>
+        /// 定子编号
+        /// </summary>
+        public string StatoNo
+        {
+            get { return _StatoNo; }
+            set { _StatoNo = value; RaisePropertyChanged(() => StatoNo); }
+        }
+private string  _ATrayNo;
+        /// <summary>
+        /// A托盘号
+        /// </summary>
+        public string ATrayNo
+        {
+            get { return _ATrayNo; }
+            set { _ATrayNo = value; RaisePropertyChanged(() => ATrayNo); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+private decimal  _CylinderTemp;
+        /// <summary>
+        /// 筒体温度
+        /// </summary>
+        public decimal CylinderTemp
+        {
+            get { return _CylinderTemp; }
+            set { _CylinderTemp = value; RaisePropertyChanged(() => CylinderTemp); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GDynStaticMachDto.cs b/GroupLine.App/ModelDto/GDynStaticMachDto.cs
new file mode 100644
index 0000000..c788ed0
--- /dev/null
+++ b/GroupLine.App/ModelDto/GDynStaticMachDto.cs
@@ -0,0 +1,95 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GDynStaticMachDto))]
+    public class GDynStaticMachDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private string  _DynaDiskNo;
+        /// <summary>
+        /// 动盘编号
+        /// </summary>
+        public string DynaDiskNo
+        {
+            get { return _DynaDiskNo; }
+            set { _DynaDiskNo = value; RaisePropertyChanged(() => DynaDiskNo); }
+        }
+private string  _StaticDiskNo;
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        public string StaticDiskNo
+        {
+            get { return _StaticDiskNo; }
+            set { _StaticDiskNo = value; RaisePropertyChanged(() => StaticDiskNo); }
+        }
+private string  _EuropMacine;
+        /// <summary>
+        /// 欧式机构
+        /// </summary>
+        public string EuropMacine
+        {
+            get { return _EuropMacine; }
+            set { _EuropMacine = value; RaisePropertyChanged(() => EuropMacine); }
+        }
+private string  _StaDskCastNo;
+        /// <summary>
+        /// 静盘铸件号
+        /// </summary>
+        public string StaDskCastNo
+        {
+            get { return _StaDskCastNo; }
+            set { _StaDskCastNo = value; RaisePropertyChanged(() => StaDskCastNo); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+//private decimal  _Torque;
+//        /// <summary>
+//        /// 扭矩值
+//        /// </summary>
+//        public decimal Torque
+//        {
+//            get { return _Torque; }
+//            set { _Torque = value; RaisePropertyChanged(() => Torque); }
+//        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GInsRotaResDto.cs b/GroupLine.App/ModelDto/GInsRotaResDto.cs
new file mode 100644
index 0000000..2f84f62
--- /dev/null
+++ b/GroupLine.App/ModelDto/GInsRotaResDto.cs
@@ -0,0 +1,107 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GInsRotaResDto))]
+    public class GInsRotaResDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private string _IsolateResults;
+        /// <summary>
+        /// 绝缘结果
+        /// </summary>
+        public string IsolateResults
+        {
+            get { return _IsolateResults; }
+            set { _IsolateResults = value; RaisePropertyChanged(() => IsolateResults); }
+        }
+        private decimal _ResValue1;
+        /// <summary>
+        /// 电阻值1
+        /// </summary>
+        public decimal ResValue1
+        {
+            get { return _ResValue1; }
+            set { _ResValue1 = value; RaisePropertyChanged(() => ResValue1); }
+        }
+        private decimal _ResValue2;
+        /// <summary>
+        /// 电阻值2
+        /// </summary>
+        public decimal ResValue2
+        {
+            get { return _ResValue2; }
+            set { _ResValue2 = value; RaisePropertyChanged(() => ResValue2); }
+        }
+        private decimal _ResValue3;
+        /// <summary>
+        /// 电阻值3
+        /// </summary>
+        public decimal ResValue3
+        {
+            get { return _ResValue3; }
+            set { _ResValue3 = value; RaisePropertyChanged(() => ResValue3); }
+        }
+
+        private string _RotaResult;
+        /// <summary>
+        /// 回转方向结果
+        /// </summary>
+        public string RotaResult
+        {
+            get { return _RotaResult; }
+            set { _RotaResult = value; RaisePropertyChanged(() => RotaResult); }
+        }
+
+        private string _ResResult;
+        /// <summary>
+        /// 阻值结果
+        /// </summary>
+        public string ResResult
+        {
+            get { return _ResResult; }
+            set { _ResResult = value; RaisePropertyChanged(() => ResResult); }
+        }
+
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GLeakCheckDto.cs b/GroupLine.App/ModelDto/GLeakCheckDto.cs
new file mode 100644
index 0000000..da5c81a
--- /dev/null
+++ b/GroupLine.App/ModelDto/GLeakCheckDto.cs
@@ -0,0 +1,77 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GLeakCheckDto))]
+    public class GLeakCheckDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _PumpVacuum;
+        /// <summary>
+        /// 抽真空值
+        /// </summary>
+        public decimal PumpVacuum
+        {
+            get { return _PumpVacuum; }
+            set { _PumpVacuum = value; RaisePropertyChanged(() => PumpVacuum); }
+        }
+private decimal  _KeepVacuum;
+        /// <summary>
+        /// 保持真空值
+        /// </summary>
+        public decimal KeepVacuum
+        {
+            get { return _KeepVacuum; }
+            set { _KeepVacuum = value; RaisePropertyChanged(() => KeepVacuum); }
+        }
+private string  _PumpVamResult;
+        /// <summary>
+        /// 抽真空值判定
+        /// </summary>
+        public string PumpVamResult
+        {
+            get { return _PumpVamResult; }
+            set { _PumpVamResult = value; RaisePropertyChanged(() => PumpVamResult); }
+        }
+private string  _KeepVamResult;
+        /// <summary>
+        /// 保持真空值判定
+        /// </summary>
+        public string KeepVamResult
+        {
+            get { return _KeepVamResult; }
+            set { _KeepVamResult = value; RaisePropertyChanged(() => KeepVamResult); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GLowVolStartDto.cs b/GroupLine.App/ModelDto/GLowVolStartDto.cs
new file mode 100644
index 0000000..e4ac193
--- /dev/null
+++ b/GroupLine.App/ModelDto/GLowVolStartDto.cs
@@ -0,0 +1,87 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GLowVolStartDto))]
+    public class GLowVolStartDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private decimal _ACur;
+        /// <summary>
+        /// A相电流值
+        /// </summary>
+        public decimal ACur
+        {
+            get { return _ACur; }
+            set { _ACur = value; RaisePropertyChanged(() => ACur); }
+        }
+        private decimal _BCur;
+        /// <summary>
+        /// B相电流值
+        /// </summary>
+        public decimal BCur
+        {
+            get { return _BCur; }
+            set { _BCur = value; RaisePropertyChanged(() => BCur); }
+        }
+
+        private decimal _CCur;
+        /// <summary>
+        /// C相电流值
+        /// </summary>
+        public decimal CCur
+        {
+            get { return _CCur; }
+            set { _CCur = value; RaisePropertyChanged(() => CCur); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GMagTorqueDto.cs b/GroupLine.App/ModelDto/GMagTorqueDto.cs
new file mode 100644
index 0000000..bc66abe
--- /dev/null
+++ b/GroupLine.App/ModelDto/GMagTorqueDto.cs
@@ -0,0 +1,68 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GMagTorqueDto))]
+    public class GMagTorqueDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _MagBeamCount;
+        /// <summary>
+        /// 磁束值
+        /// </summary>
+        public decimal MagBeamCount
+        {
+            get { return _MagBeamCount; }
+            set { _MagBeamCount = value; RaisePropertyChanged(() => MagBeamCount); }
+        }
+private decimal  _TorqueValue;
+        /// <summary>
+        /// 扭矩值
+        /// </summary>
+        public decimal TorqueValue
+        {
+            get { return _TorqueValue; }
+            set { _TorqueValue = value; RaisePropertyChanged(() => TorqueValue); }
+        }
+private string  _Result;
+        /// <summary>
+        /// 结果
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GOilPumpInstallDto.cs b/GroupLine.App/ModelDto/GOilPumpInstallDto.cs
new file mode 100644
index 0000000..7f1c9a5
--- /dev/null
+++ b/GroupLine.App/ModelDto/GOilPumpInstallDto.cs
@@ -0,0 +1,140 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GOilPumpInstallDto))]
+    public class GOilPumpInstallDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private string _OilPumpNo;
+        /// <summary>
+        /// 油泵编号
+        /// </summary>
+        public string OilPumpNo
+        {
+            get { return _OilPumpNo; }
+            set { _OilPumpNo = value; RaisePropertyChanged(() => OilPumpNo); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private string _OilPmpBruRsult;
+        /// <summary>
+        /// 油泵磕伤确认
+        /// </summary>
+        public string OilPmpBruRsult
+        {
+            get { return _OilPmpBruRsult; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _OilPmpBruRsult = "有磕伤";
+                        break;
+                    case "0":
+                        _OilPmpBruRsult = "无磕伤";
+                        break;
+                    default:
+                        _OilPmpBruRsult = "无";
+                        break;
+                }
+                RaisePropertyChanged(() => OilPmpBruRsult);
+            }
+        }
+        private string _IsReturn;
+        /// <summary>
+        /// 是否是返修品
+        /// </summary>
+        public string IsReturn
+        {
+            get { return _IsReturn; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _IsReturn = "返修品";
+                        break;
+                    case "0":
+                        _IsReturn = "非返修品";
+                        break;
+                    default:
+                        _IsReturn = "无";
+                        break;
+                }
+                RaisePropertyChanged(() => IsReturn);
+            }
+        }
+        private string _WeldSpotUI;
+        /// <summary>
+        /// 焊点外观
+        /// </summary>
+        public string WeldSpotUI
+        {
+            get { return _WeldSpotUI; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _WeldSpotUI = "有磕伤";
+                        break;
+                    case "0":
+                        _WeldSpotUI = "无磕伤";
+                        break;
+                    default:
+                        _WeldSpotUI = "无";
+                        break;
+                }
+                RaisePropertyChanged(() => WeldSpotUI);
+            }
+        }
+        private string _Result;
+        /// <summary>
+        /// 结果
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GRingWeldMachDto.cs b/GroupLine.App/ModelDto/GRingWeldMachDto.cs
new file mode 100644
index 0000000..d0ef635
--- /dev/null
+++ b/GroupLine.App/ModelDto/GRingWeldMachDto.cs
@@ -0,0 +1,131 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GRingWeldMachDto))]
+    public class GRingWeldMachDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private decimal _Vol1;
+        /// <summary>
+        /// 电压值1
+        /// </summary>
+        public decimal Vol1
+        {
+            get { return _Vol1; }
+            set { _Vol1 = value; RaisePropertyChanged(() => Vol1); }
+        }
+        private int _Cur1;
+        /// <summary>
+        /// 电流值1
+        /// </summary>
+        public int Cur1
+        {
+            get { return _Cur1; }
+            set { _Cur1 = value; RaisePropertyChanged(() => Cur1); }
+        }
+        private decimal _WeldTime1;
+        /// <summary>
+        /// 焊接时间1
+        /// </summary>
+        public decimal WeldTime1
+        {
+            get { return _WeldTime1; }
+            set { _WeldTime1 = value; RaisePropertyChanged(() => WeldTime1); }
+        }
+        private decimal _Vol2;
+        /// <summary>
+        /// 电压值2
+        /// </summary>
+        public decimal Vol2
+        {
+            get { return _Vol2; }
+            set { _Vol2 = value; RaisePropertyChanged(() => Vol2); }
+        }
+        private int _Cur2;
+        /// <summary>
+        /// 电流值2
+        /// </summary>
+        public int Cur2
+        {
+            get { return _Cur2; }
+            set { _Cur2 = value; RaisePropertyChanged(() => Cur2); }
+        }
+        private decimal _WeldTime2;
+        /// <summary>
+        /// 焊接时间2
+        /// </summary>
+        public decimal WeldTime2
+        {
+            get { return _WeldTime2; }
+            set { _WeldTime2 = value; RaisePropertyChanged(() => WeldTime2); }
+        }
+        private int _NozzleClean;
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        public int NozzleClean
+        {
+            get { return _NozzleClean; }
+            set { _NozzleClean = value; RaisePropertyChanged(() => NozzleClean); }
+        }
+        private int _NozzleReplace;
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        public int NozzleReplace
+        {
+            get { return _NozzleReplace; }
+            set { _NozzleReplace = value; RaisePropertyChanged(() => NozzleReplace); }
+        }
+        private string _Fixture;
+        /// <summary>
+        /// 夹具
+        /// </summary>
+        public string Fixture
+        {
+            get { return _Fixture; }
+            set { _Fixture = value; RaisePropertyChanged(() => Fixture); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 判定OK/NG
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GRotorBurnEbDto.cs b/GroupLine.App/ModelDto/GRotorBurnEbDto.cs
new file mode 100644
index 0000000..2b29e91
--- /dev/null
+++ b/GroupLine.App/ModelDto/GRotorBurnEbDto.cs
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GRotorBurnEbDto))]
+    public class GRotorBurnEbDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _RotorNo;
+        /// <summary>
+        /// 转子编号
+        /// </summary>
+        public string RotorNo
+        {
+            get { return _RotorNo; }
+            set { _RotorNo = value; RaisePropertyChanged(() => RotorNo); }
+        }
+private string  _CrankshaftNo;
+        /// <summary>
+        /// 曲轴编号
+        /// </summary>
+        public string CrankshaftNo
+        {
+            get { return _CrankshaftNo; }
+            set { _CrankshaftNo = value; RaisePropertyChanged(() => CrankshaftNo); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GRotorMagDto.cs b/GroupLine.App/ModelDto/GRotorMagDto.cs
new file mode 100644
index 0000000..66e82bc
--- /dev/null
+++ b/GroupLine.App/ModelDto/GRotorMagDto.cs
@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GRotorMagDto))]
+    public class GRotorMagDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string _RotorNo;
+        /// <summary>
+        /// 转子编号
+        /// </summary>
+        public string RotorNo
+        {
+            get { return _RotorNo; }
+            set { _RotorNo = value; RaisePropertyChanged(() => RotorNo); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private decimal _MagBeamCount;
+        /// <summary>
+        /// 磁束量
+        /// </summary>
+        public decimal MagBeamCount
+        {
+            get { return _MagBeamCount; }
+            set { _MagBeamCount = value; RaisePropertyChanged(() => MagBeamCount); }
+        }
+        private decimal _Current;
+        /// <summary>
+        /// 电流值
+        /// </summary>
+        public decimal Current
+        {
+            get { return _Current; }
+            set { _Current = value; RaisePropertyChanged(() => Current); }
+        }
+        private decimal _RotorAngle;
+        /// <summary>
+        /// 转子角度
+        /// </summary>
+        public decimal RotorAngle
+        {
+            get { return _RotorAngle; }
+            set { _RotorAngle = value; RaisePropertyChanged(() => RotorAngle); }
+        }
+        private string _RotorAgleRsult;
+        /// <summary>
+        /// 转子角度判定
+        /// </summary>
+        public string RotorAgleRsult
+        {
+            get { return _RotorAgleRsult; }
+            set { _RotorAgleRsult = value; RaisePropertyChanged(() => RotorAgleRsult); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GShrinkTubDto.cs b/GroupLine.App/ModelDto/GShrinkTubDto.cs
new file mode 100644
index 0000000..b470b8b
--- /dev/null
+++ b/GroupLine.App/ModelDto/GShrinkTubDto.cs
@@ -0,0 +1,77 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GShrinkTubDto))]
+    public class GShrinkTubDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private decimal _FinalLoad;
+        /// <summary>
+        /// 终负荷
+        /// </summary>
+        public decimal FinalLoad
+        {
+            get { return _FinalLoad; }
+            set { _FinalLoad = value; RaisePropertyChanged(() => FinalLoad); }
+        }
+        private decimal _FinalLocation;
+        /// <summary>
+        /// 终位置
+        /// </summary>
+        public decimal FinalLocation
+        {
+            get { return _FinalLocation; }
+            set { _FinalLocation = value; RaisePropertyChanged(() => FinalLocation); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GSpotWeldMachDto.cs b/GroupLine.App/ModelDto/GSpotWeldMachDto.cs
new file mode 100644
index 0000000..083e9f1
--- /dev/null
+++ b/GroupLine.App/ModelDto/GSpotWeldMachDto.cs
@@ -0,0 +1,275 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GSpotWeldMachDto))]
+    public class GSpotWeldMachDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _VolR1_1;
+        /// <summary>
+        /// 电压R1-1
+        /// </summary>
+        public decimal VolR1_1
+        {
+            get { return _VolR1_1; }
+            set { _VolR1_1 = value; RaisePropertyChanged(() => VolR1_1); }
+        }
+private int  _CurR1_1;
+        /// <summary>
+        /// 电流R1-1
+        /// </summary>
+        public int CurR1_1
+        {
+            get { return _CurR1_1; }
+            set { _CurR1_1 = value; RaisePropertyChanged(() => CurR1_1); }
+        }
+private decimal  _WeldTimeR1_1;
+        /// <summary>
+        /// 焊接时间R1-1
+        /// </summary>
+        public decimal WeldTimeR1_1
+        {
+            get { return _WeldTimeR1_1; }
+            set { _WeldTimeR1_1 = value; RaisePropertyChanged(() => WeldTimeR1_1); }
+        }
+private decimal  _VolR1_2;
+        /// <summary>
+        /// 电压R1-2
+        /// </summary>
+        public decimal VolR1_2
+        {
+            get { return _VolR1_2; }
+            set { _VolR1_2 = value; RaisePropertyChanged(() => VolR1_2); }
+        }
+private int  _CurR1_2;
+        /// <summary>
+        /// 电流R1-2
+        /// </summary>
+        public int CurR1_2
+        {
+            get { return _CurR1_2; }
+            set { _CurR1_2 = value; RaisePropertyChanged(() => CurR1_2); }
+        }
+private decimal  _WeldTimeR1_2;
+        /// <summary>
+        /// 焊接时间R1-2
+        /// </summary>
+        public decimal WeldTimeR1_2
+        {
+            get { return _WeldTimeR1_2; }
+            set { _WeldTimeR1_2 = value; RaisePropertyChanged(() => WeldTimeR1_2); }
+        }
+private decimal  _VolR1_3;
+        /// <summary>
+        /// 电压R1-3
+        /// </summary>
+        public decimal VolR1_3
+        {
+            get { return _VolR1_3; }
+            set { _VolR1_3 = value; RaisePropertyChanged(() => VolR1_3); }
+        }
+private int  _CurR1_3;
+        /// <summary>
+        /// 电流R1-3
+        /// </summary>
+        public int CurR1_3
+        {
+            get { return _CurR1_3; }
+            set { _CurR1_3 = value; RaisePropertyChanged(() => CurR1_3); }
+        }
+private decimal  _WeldTimeR1_3;
+        /// <summary>
+        /// 焊接时间R1-3
+        /// </summary>
+        public decimal WeldTimeR1_3
+        {
+            get { return _WeldTimeR1_3; }
+            set { _WeldTimeR1_3 = value; RaisePropertyChanged(() => WeldTimeR1_3); }
+        }
+private decimal  _VolR1_4;
+        /// <summary>
+        /// 电压R1-4
+        /// </summary>
+        public decimal VolR1_4
+        {
+            get { return _VolR1_4; }
+            set { _VolR1_4 = value; RaisePropertyChanged(() => VolR1_4); }
+        }
+private int  _CurR1_4;
+        /// <summary>
+        /// 电流R1-4
+        /// </summary>
+        public int CurR1_4
+        {
+            get { return _CurR1_4; }
+            set { _CurR1_4 = value; RaisePropertyChanged(() => CurR1_4); }
+        }
+private decimal  _WeldTimeR1_4;
+        /// <summary>
+        /// 焊接时间R1-4
+        /// </summary>
+        public decimal WeldTimeR1_4
+        {
+            get { return _WeldTimeR1_4; }
+            set { _WeldTimeR1_4 = value; RaisePropertyChanged(() => WeldTimeR1_4); }
+        }
+private decimal  _VolR2_1;
+        /// <summary>
+        /// 电压R2-1
+        /// </summary>
+        public decimal VolR2_1
+        {
+            get { return _VolR2_1; }
+            set { _VolR2_1 = value; RaisePropertyChanged(() => VolR2_1); }
+        }
+private int  _CurR2_1;
+        /// <summary>
+        /// 电流R2-1
+        /// </summary>
+        public int CurR2_1
+        {
+            get { return _CurR2_1; }
+            set { _CurR2_1 = value; RaisePropertyChanged(() => CurR2_1); }
+        }
+private decimal  _WeldTimeR2_1;
+        /// <summary>
+        /// 焊接时间R2-1
+        /// </summary>
+        public decimal WeldTimeR2_1
+        {
+            get { return _WeldTimeR2_1; }
+            set { _WeldTimeR2_1 = value; RaisePropertyChanged(() => WeldTimeR2_1); }
+        }
+private decimal  _VolR2_2;
+        /// <summary>
+        /// 电压R2-2
+        /// </summary>
+        public decimal VolR2_2
+        {
+            get { return _VolR2_2; }
+            set { _VolR2_2 = value; RaisePropertyChanged(() => VolR2_2); }
+        }
+private int  _CurR2_2;
+        /// <summary>
+        /// 电流R2-2
+        /// </summary>
+        public int CurR2_2
+        {
+            get { return _CurR2_2; }
+            set { _CurR2_2 = value; RaisePropertyChanged(() => CurR2_2); }
+        }
+private decimal  _WeldTimeR2_2;
+        /// <summary>
+        /// 焊接时间R2-2
+        /// </summary>
+        public decimal WeldTimeR2_2
+        {
+            get { return _WeldTimeR2_2; }
+            set { _WeldTimeR2_2 = value; RaisePropertyChanged(() => WeldTimeR2_2); }
+        }
+private decimal  _VolR2_3;
+        /// <summary>
+        /// 电压R2-3
+        /// </summary>
+        public decimal VolR2_3
+        {
+            get { return _VolR2_3; }
+            set { _VolR2_3 = value; RaisePropertyChanged(() => VolR2_3); }
+        }
+private int  _CurR2_3;
+        /// <summary>
+        /// 电流R2-3
+        /// </summary>
+        public int CurR2_3
+        {
+            get { return _CurR2_3; }
+            set { _CurR2_3 = value; RaisePropertyChanged(() => CurR2_3); }
+        }
+private decimal  _WeldTimeR2_3;
+        /// <summary>
+        /// 焊接时间R2-3
+        /// </summary>
+        public decimal WeldTimeR2_3
+        {
+            get { return _WeldTimeR2_3; }
+            set { _WeldTimeR2_3 = value; RaisePropertyChanged(() => WeldTimeR2_3); }
+        }
+private decimal  _VolR2_4;
+        /// <summary>
+        /// 电压R2-4
+        /// </summary>
+        public decimal VolR2_4
+        {
+            get { return _VolR2_4; }
+            set { _VolR2_4 = value; RaisePropertyChanged(() => VolR2_4); }
+        }
+private int  _CurR2_4;
+        /// <summary>
+        /// 电流R2-4
+        /// </summary>
+        public int CurR2_4
+        {
+            get { return _CurR2_4; }
+            set { _CurR2_4 = value; RaisePropertyChanged(() => CurR2_4); }
+        }
+private decimal  _WeldTimeR2_4;
+        /// <summary>
+        /// 焊接时间R2-4
+        /// </summary>
+        public decimal WeldTimeR2_4
+        {
+            get { return _WeldTimeR2_4; }
+            set { _WeldTimeR2_4 = value; RaisePropertyChanged(() => WeldTimeR2_4); }
+        }
+private int  _NozzleClean;
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        public int NozzleClean
+        {
+            get { return _NozzleClean; }
+            set { _NozzleClean = value; RaisePropertyChanged(() => NozzleClean); }
+        }
+private int  _NozzleReplace;
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        public int NozzleReplace
+        {
+            get { return _NozzleReplace; }
+            set { _NozzleReplace = value; RaisePropertyChanged(() => NozzleReplace); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/GStaticDiskMachDto.cs b/GroupLine.App/ModelDto/GStaticDiskMachDto.cs
new file mode 100644
index 0000000..f293bee
--- /dev/null
+++ b/GroupLine.App/ModelDto/GStaticDiskMachDto.cs
@@ -0,0 +1,332 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(GStaticDiskMachDto))]
+    public class GStaticDiskMachDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+
+
+        private string _MachineCode;
+        /// <summary>
+        /// 机型
+        /// </summary>
+        public string MachineCode
+        {
+            get { return _MachineCode; }
+            set { _MachineCode = value; RaisePropertyChanged(() => _MachineCode); }
+        }
+
+
+        private decimal _Cycle;
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        public decimal Cycle
+        {
+            get { return _Cycle; }
+            set { _Cycle = value; RaisePropertyChanged(() => Cycle); }
+        }
+
+        private int _ScrewCount;
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        public int ScrewCount
+        {
+            get { return _ScrewCount; }
+            set { _ScrewCount = value; RaisePropertyChanged(() => ScrewCount); }
+        }
+
+
+        private decimal _FinalTorque;
+        /// <summary>
+        /// 最终扭矩
+        /// </summary>
+        public decimal FinalTorque
+        {
+            get { return _FinalTorque; }
+            set { _FinalTorque = value; RaisePropertyChanged(() => FinalTorque); }
+        }
+        private decimal _FinalAngle;
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        public decimal FinalAngle
+        {
+            get { return _FinalAngle; }
+            set { _FinalAngle = value; RaisePropertyChanged(() => FinalAngle); }
+        }
+
+
+        private decimal _FinalTorque2;
+        /// <summary>
+        /// 最终扭矩2
+        /// </summary>
+        public decimal FinalTorque2
+        {
+            get { return _FinalTorque2; }
+            set { _FinalTorque2 = value; RaisePropertyChanged(() => FinalTorque2); }
+        }
+        private decimal _FinalAngle2;
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        public decimal FinalAngle2
+        {
+            get { return _FinalAngle2; }
+            set { _FinalAngle2 = value; RaisePropertyChanged(() => FinalAngle2); }
+        }
+
+
+        private decimal _FinalTorque3;
+        /// <summary>
+        /// 最终扭矩3
+        /// </summary>
+        public decimal FinalTorque3
+        {
+            get { return _FinalTorque3; }
+            set { _FinalTorque3 = value; RaisePropertyChanged(() => FinalTorque3); }
+        }
+        private decimal _FinalAngle3;
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        public decimal FinalAngle3
+        {
+            get { return _FinalAngle3; }
+            set { _FinalAngle3 = value; RaisePropertyChanged(() => FinalAngle3); }
+        }
+
+
+        private decimal _FinalTorque4;
+        /// <summary>
+        /// 最终扭矩4
+        /// </summary>
+        public decimal FinalTorque4
+        {
+            get { return _FinalTorque4; }
+            set { _FinalTorque4 = value; RaisePropertyChanged(() => FinalTorque4); }
+        }
+        private decimal _FinalAngle4;
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        public decimal FinalAngle4
+        {
+            get { return _FinalAngle4; }
+            set { _FinalAngle4 = value; RaisePropertyChanged(() => FinalAngle4); }
+        }
+
+
+        private decimal _FinalTorque5;
+        /// <summary>
+        /// 最终扭矩5
+        /// </summary>
+        public decimal FinalTorque5
+        {
+            get { return _FinalTorque5; }
+            set { _FinalTorque5 = value; RaisePropertyChanged(() => FinalTorque5); }
+        }
+        private decimal _FinalAngle5;
+        /// <summary>
+        /// 最终角度5
+        /// </summary>
+        public decimal FinalAngle5
+        {
+            get { return _FinalAngle5; }
+            set { _FinalAngle5= value; RaisePropertyChanged(() => FinalAngle5); }
+        }
+
+
+        private decimal _FinalTorque6;
+        /// <summary>
+        /// 最终扭矩6
+        /// </summary>
+        public decimal FinalTorque6
+        {
+            get { return _FinalTorque6; }
+            set { _FinalTorque6 = value; RaisePropertyChanged(() => FinalTorque6); }
+        }
+        private decimal _FinalAngle6;
+        /// <summary>
+        /// 最终角度6
+        /// </summary>
+        public decimal FinalAngle6
+        {
+            get { return _FinalAngle6; }
+            set { _FinalAngle6 = value; RaisePropertyChanged(() => FinalAngle6); }
+        }
+
+
+        private decimal _FinalTorque7;
+        /// <summary>
+        /// 最终扭矩7
+        /// </summary>
+        public decimal FinalTorque7
+        {
+            get { return _FinalTorque7; }
+            set { _FinalTorque7 = value; RaisePropertyChanged(() => FinalTorque7); }
+        }
+        private decimal _FinalAngle7;
+        /// <summary>
+        /// 最终角度7
+        /// </summary>
+        public decimal FinalAngle7
+        {
+            get { return _FinalAngle7; }
+            set { _FinalAngle7 = value; RaisePropertyChanged(() => FinalAngle7); }
+        }
+
+
+        private decimal _FinalTorque8;
+        /// <summary>
+        /// 最终扭矩8
+        /// </summary>
+        public decimal FinalTorque8
+        {
+            get { return _FinalTorque8; }
+            set { _FinalTorque8 = value; RaisePropertyChanged(() => FinalTorque8); }
+        }
+        private decimal _FinalAngle8;
+        /// <summary>
+        /// 最终角度8
+        /// </summary>
+        public decimal FinalAngle8
+        {
+            get { return _FinalAngle8; }
+            set { _FinalAngle8 = value; RaisePropertyChanged(() => FinalAngle8); }
+        }
+
+
+        private decimal _FinalTorque9;
+        /// <summary>
+        /// 最终扭矩9
+        /// </summary>
+        public decimal FinalTorque9
+        {
+            get { return _FinalTorque9; }
+            set { _FinalTorque9 = value; RaisePropertyChanged(() => FinalTorque9); }
+        }
+        private decimal _FinalAngle9;
+        /// <summary>
+        /// 最终角度9
+        /// </summary>
+        public decimal FinalAngle9
+        {
+            get { return _FinalAngle9; }
+            set { _FinalAngle9 = value; RaisePropertyChanged(() => FinalAngle9); }
+        }
+
+        private decimal _FinalTorque10;
+        /// <summary>
+        /// 最终扭矩10
+        /// </summary>
+        public decimal FinalTorque10
+        {
+            get { return _FinalTorque10; }
+            set { _FinalTorque10 = value; RaisePropertyChanged(() => FinalTorque10); }
+        }
+        private decimal _FinalAngle10;
+        /// <summary>
+        /// 最终角度10
+        /// </summary>
+        public decimal FinalAngle10
+        {
+            get { return _FinalAngle10; }
+            set { _FinalAngle10 = value; RaisePropertyChanged(() => FinalAngle10); }
+        }
+
+
+        private decimal _FinalTorque11;
+        /// <summary>
+        /// 最终扭矩11
+        /// </summary>
+        public decimal FinalTorque11
+        {
+            get { return _FinalTorque11; }
+            set { _FinalTorque11 = value; RaisePropertyChanged(() => FinalTorque11); }
+        }
+        private decimal _FinalAngle11;
+        /// <summary>
+        /// 最终角度11
+        /// </summary>
+        public decimal FinalAngle11
+        {
+            get { return _FinalAngle11; }
+            set { _FinalAngle11 = value; RaisePropertyChanged(() => FinalAngle11); }
+        }
+
+
+        private decimal _FinalTorque12;
+        /// <summary>
+        /// 最终扭矩12
+        /// </summary>
+        public decimal FinalTorque12
+        {
+            get { return _FinalTorque12; }
+            set { _FinalTorque12 = value; RaisePropertyChanged(() => FinalTorque12); }
+        }
+        private decimal _FinalAngle12;
+        /// <summary>
+        /// 最终角度12
+        /// </summary>
+        public decimal FinalAngle12
+        {
+            get { return _FinalAngle12; }
+            set { _FinalAngle12 = value; RaisePropertyChanged(() => FinalAngle12); }
+        }
+
+
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPCDTransplantDto.cs b/GroupLine.App/ModelDto/KPCDTransplantDto.cs
new file mode 100644
index 0000000..f535beb
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPCDTransplantDto.cs
@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPCDTransplantDto))]
+    public class KPCDTransplantDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPDynStaticMachDto.cs b/GroupLine.App/ModelDto/KPDynStaticMachDto.cs
new file mode 100644
index 0000000..7707b9e
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPDynStaticMachDto.cs
@@ -0,0 +1,137 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPDynStaticMachDto))]
+    public class KPDynStaticMachDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private string _DynaDiskNo;
+        /// <summary>
+        /// 动盘编号
+        /// </summary>
+        public string DynaDiskNo
+        {
+            get { return _DynaDiskNo; }
+            set { _DynaDiskNo = value; RaisePropertyChanged(() => DynaDiskNo); }
+        }
+        private string _StaticDiskNo;
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        public string StaticDiskNo
+        {
+            get { return _StaticDiskNo; }
+            set { _StaticDiskNo = value; RaisePropertyChanged(() => StaticDiskNo); }
+        }
+        private string _EuropMacine;
+        /// <summary>
+        /// 欧式机构
+        /// </summary>
+        public string EuropMacine
+        {
+            get { return _EuropMacine; }
+            set { _EuropMacine = value; RaisePropertyChanged(() => EuropMacine); }
+        }
+        private string _StaDskCastNo;
+        /// <summary>
+        /// 静盘铸件号
+        /// </summary>
+        public string StaDskCastNo
+        {
+            get { return _StaDskCastNo; }
+            set { _StaDskCastNo = value; RaisePropertyChanged(() => StaDskCastNo); }
+        }
+
+        private string _MeterGap;
+        /// <summary>
+        /// 间隙值 玛仪器测量
+        /// </summary>
+        public string MeterGap
+        {
+            get { return _MeterGap; }
+            set { _MeterGap = value; RaisePropertyChanged(() => MeterGap); }
+        }
+
+
+        private string _MeterGroup;
+        /// <summary>
+        /// 分组 玛仪器测量
+        /// </summary>
+        public string MeterGroup
+        {
+            get { return _MeterGroup; }
+            set { _MeterGroup = value; RaisePropertyChanged(() => MeterGroup); }
+        }
+
+
+        private string _MeterResult;
+        /// <summary>
+        /// 结论 玛仪器测量
+        /// </summary>
+        public string MeterResult
+        {
+            get { return _MeterResult; }
+            set { _MeterResult = value; RaisePropertyChanged(() => MeterResult); }
+        }
+
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        //private decimal  _Torque;
+        //        /// <summary>
+        //        /// 扭矩值
+        //        /// </summary>
+        //        public decimal Torque
+        //        {
+        //            get { return _Torque; }
+        //            set { _Torque = value; RaisePropertyChanged(() => Torque); }
+        //        }
+        private string _EuopMaDifValue;
+        /// <summary>
+        /// 欧式机构段差值
+        /// </summary>
+        public string EuopMaDifValue
+        {
+            get { return _EuopMaDifValue; }
+            set { _EuopMaDifValue = value; RaisePropertyChanged(() => EuopMaDifValue); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPLeakCheckDto.cs b/GroupLine.App/ModelDto/KPLeakCheckDto.cs
new file mode 100644
index 0000000..b00da9d
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPLeakCheckDto.cs
@@ -0,0 +1,77 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPLeakCheckDto))]
+    public class KPLeakCheckDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _PumpVacuum;
+        /// <summary>
+        /// 抽真空值
+        /// </summary>
+        public decimal PumpVacuum
+        {
+            get { return _PumpVacuum; }
+            set { _PumpVacuum = value; RaisePropertyChanged(() => PumpVacuum); }
+        }
+private decimal  _KeepVacuum;
+        /// <summary>
+        /// 保持真空值
+        /// </summary>
+        public decimal KeepVacuum
+        {
+            get { return _KeepVacuum; }
+            set { _KeepVacuum = value; RaisePropertyChanged(() => KeepVacuum); }
+        }
+private string  _PumpVamResult;
+        /// <summary>
+        /// 抽真空值判定
+        /// </summary>
+        public string PumpVamResult
+        {
+            get { return _PumpVamResult; }
+            set { _PumpVamResult = value; RaisePropertyChanged(() => PumpVamResult); }
+        }
+private string  _KeepVamResult;
+        /// <summary>
+        /// 保持真空值判定
+        /// </summary>
+        public string KeepVamResult
+        {
+            get { return _KeepVamResult; }
+            set { _KeepVamResult = value; RaisePropertyChanged(() => KeepVamResult); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPLowVolStartDto.cs b/GroupLine.App/ModelDto/KPLowVolStartDto.cs
new file mode 100644
index 0000000..9e8cd99
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPLowVolStartDto.cs
@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPLowVolStartDto))]
+    public class KPLowVolStartDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _ACur;
+        /// <summary>
+        /// A相电流值
+        /// </summary>
+        public decimal ACur
+        {
+            get { return _ACur; }
+            set { _ACur = value; RaisePropertyChanged(() => ACur); }
+        }
+private decimal  _BCur;
+        /// <summary>
+        /// B相电流值
+        /// </summary>
+        public decimal BCur
+        {
+            get { return _BCur; }
+            set { _BCur = value; RaisePropertyChanged(() => BCur); }
+        }
+private decimal  _CCur;
+        /// <summary>
+        /// C相电流值
+        /// </summary>
+        public decimal CCur
+        {
+            get { return _CCur; }
+            set { _CCur = value; RaisePropertyChanged(() => CCur); }
+        }
+private string  _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPMagTorqueDto.cs b/GroupLine.App/ModelDto/KPMagTorqueDto.cs
new file mode 100644
index 0000000..1c8962d
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPMagTorqueDto.cs
@@ -0,0 +1,68 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPMagTorqueDto))]
+    public class KPMagTorqueDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _MagBeamCount;
+        /// <summary>
+        /// 磁束值
+        /// </summary>
+        public decimal MagBeamCount
+        {
+            get { return _MagBeamCount; }
+            set { _MagBeamCount = value; RaisePropertyChanged(() => MagBeamCount); }
+        }
+private decimal  _TorqueValue;
+        /// <summary>
+        /// 扭矩值
+        /// </summary>
+        public decimal TorqueValue
+        {
+            get { return _TorqueValue; }
+            set { _TorqueValue = value; RaisePropertyChanged(() => TorqueValue); }
+        }
+private string  _Result;
+        /// <summary>
+        /// 结果
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPOilPumpInstallDto.cs b/GroupLine.App/ModelDto/KPOilPumpInstallDto.cs
new file mode 100644
index 0000000..4829b8d
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPOilPumpInstallDto.cs
@@ -0,0 +1,140 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPOilPumpInstallDto))]
+    public class KPOilPumpInstallDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private string  _OilPumpNo;
+        /// <summary>
+        /// 油泵编号
+        /// </summary>
+        public string OilPumpNo
+        {
+            get { return _OilPumpNo; }
+            set { _OilPumpNo = value; RaisePropertyChanged(() => OilPumpNo); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private string _OilPmpBruRsult;
+        /// <summary>
+        /// 油泵磕伤确认
+        /// </summary>
+        public string OilPmpBruRsult
+        {
+            get { return _OilPmpBruRsult; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _OilPmpBruRsult = "有磕伤";
+                        break;
+                    case "0":
+                        _OilPmpBruRsult = "无磕伤";
+                        break;
+                    default:
+                        _OilPmpBruRsult = "无";
+                        break;
+                }
+                RaisePropertyChanged(() => OilPmpBruRsult);
+            }
+        }
+        private string _IsReturn;
+        /// <summary>
+        /// 是否是返修品
+        /// </summary>
+        public string IsReturn
+        {
+            get { return _IsReturn; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _IsReturn = "返修品";
+                        break;
+                    case "0":
+                        _IsReturn = "非返修品";
+                        break;
+                    default:
+                        _IsReturn = "无";
+                        break;
+                }
+                RaisePropertyChanged(() => IsReturn);
+            }
+        }
+        private string _WeldSpotUI;
+        /// <summary>
+        /// 焊点外观
+        /// </summary>
+        public string WeldSpotUI
+        {
+            get { return _WeldSpotUI; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _WeldSpotUI = "有磕伤";
+                        break;
+                    case "0":
+                        _WeldSpotUI = "无磕伤";
+                        break;
+                    default:
+                        _WeldSpotUI = "无";
+                        break;
+                }
+                RaisePropertyChanged(() => WeldSpotUI);
+            }
+        }
+        private string  _Result;
+        /// <summary>
+        /// 结果
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPRingWeldMachDto.cs b/GroupLine.App/ModelDto/KPRingWeldMachDto.cs
new file mode 100644
index 0000000..da00bea
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPRingWeldMachDto.cs
@@ -0,0 +1,131 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPRingWeldMachDto))]
+    public class KPRingWeldMachDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _Vol1;
+        /// <summary>
+        /// 电压值1
+        /// </summary>
+        public decimal Vol1
+        {
+            get { return _Vol1; }
+            set { _Vol1 = value; RaisePropertyChanged(() => Vol1); }
+        }
+private int  _Cur1;
+        /// <summary>
+        /// 电流值1
+        /// </summary>
+        public int Cur1
+        {
+            get { return _Cur1; }
+            set { _Cur1 = value; RaisePropertyChanged(() => Cur1); }
+        }
+private decimal  _WeldTime1;
+        /// <summary>
+        /// 焊接时间1
+        /// </summary>
+        public decimal WeldTime1
+        {
+            get { return _WeldTime1; }
+            set { _WeldTime1 = value; RaisePropertyChanged(() => WeldTime1); }
+        }
+private decimal  _Vol2;
+        /// <summary>
+        /// 电压值2
+        /// </summary>
+        public decimal Vol2
+        {
+            get { return _Vol2; }
+            set { _Vol2 = value; RaisePropertyChanged(() => Vol2); }
+        }
+private int  _Cur2;
+        /// <summary>
+        /// 电流值2
+        /// </summary>
+        public int Cur2
+        {
+            get { return _Cur2; }
+            set { _Cur2 = value; RaisePropertyChanged(() => Cur2); }
+        }
+private decimal  _WeldTime2;
+        /// <summary>
+        /// 焊接时间2
+        /// </summary>
+        public decimal WeldTime2
+        {
+            get { return _WeldTime2; }
+            set { _WeldTime2 = value; RaisePropertyChanged(() => WeldTime2); }
+        }
+private int  _NozzleClean;
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        public int NozzleClean
+        {
+            get { return _NozzleClean; }
+            set { _NozzleClean = value; RaisePropertyChanged(() => NozzleClean); }
+        }
+private int  _NozzleReplace;
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        public int NozzleReplace
+        {
+            get { return _NozzleReplace; }
+            set { _NozzleReplace = value; RaisePropertyChanged(() => NozzleReplace); }
+        }
+private string  _Fixture;
+        /// <summary>
+        /// 夹具
+        /// </summary>
+        public string Fixture
+        {
+            get { return _Fixture; }
+            set { _Fixture = value; RaisePropertyChanged(() => Fixture); }
+        }
+private string  _Result;
+        /// <summary>
+        /// 判定OK/NG
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPRingWeldMachDwDto.cs b/GroupLine.App/ModelDto/KPRingWeldMachDwDto.cs
new file mode 100644
index 0000000..5d50e0c
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPRingWeldMachDwDto.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPRingWeldMachDwDto))]
+    public class KPRingWeldMachDwDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private decimal _Vol1;
+        /// <summary>
+        /// 电压值1
+        /// </summary>
+        public decimal Vol1
+        {
+            get { return _Vol1; }
+            set { _Vol1 = value; RaisePropertyChanged(() => Vol1); }
+        }
+        private int _Cur1;
+        /// <summary>
+        /// 电流值1
+        /// </summary>
+        public int Cur1
+        {
+            get { return _Cur1; }
+            set { _Cur1 = value; RaisePropertyChanged(() => Cur1); }
+        }
+        private decimal _WeldTime1;
+        /// <summary>
+        /// 焊接时间1
+        /// </summary>
+        public decimal WeldTime1
+        {
+            get { return _WeldTime1; }
+            set { _WeldTime1 = value; RaisePropertyChanged(() => WeldTime1); }
+        }
+        private decimal _Vol2;
+        /// <summary>
+        /// 电压值2
+        /// </summary>
+        public decimal Vol2
+        {
+            get { return _Vol2; }
+            set { _Vol2 = value; RaisePropertyChanged(() => Vol2); }
+        }
+        private int _Cur2;
+        /// <summary>
+        /// 电流值2
+        /// </summary>
+        public int Cur2
+        {
+            get { return _Cur2; }
+            set { _Cur2 = value; RaisePropertyChanged(() => Cur2); }
+        }
+        private decimal _WeldTime2;
+        /// <summary>
+        /// 焊接时间2
+        /// </summary>
+        public decimal WeldTime2
+        {
+            get { return _WeldTime2; }
+            set { _WeldTime2 = value; RaisePropertyChanged(() => WeldTime2); }
+        }
+        private int _NozzleClean;
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        public int NozzleClean
+        {
+            get { return _NozzleClean; }
+            set { _NozzleClean = value; RaisePropertyChanged(() => NozzleClean); }
+        }
+        private int _NozzleReplace;
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        public int NozzleReplace
+        {
+            get { return _NozzleReplace; }
+            set { _NozzleReplace = value; RaisePropertyChanged(() => NozzleReplace); }
+        }
+        private string _Fixture;
+        /// <summary>
+        /// 夹具
+        /// </summary>
+        public string Fixture
+        {
+            get { return _Fixture; }
+            set { _Fixture = value; RaisePropertyChanged(() => Fixture); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 判定OK/NG
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPRingWeldMachUpDto.cs b/GroupLine.App/ModelDto/KPRingWeldMachUpDto.cs
new file mode 100644
index 0000000..be61fc2
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPRingWeldMachUpDto.cs
@@ -0,0 +1,133 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPRingWeldMachUpDto))]
+    public class KPRingWeldMachUpDto : ValidateModelBase
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private decimal _Vol1;
+        /// <summary>
+        /// 电压值1
+        /// </summary>
+        public decimal Vol1
+        {
+            get { return _Vol1; }
+            set { _Vol1 = value; RaisePropertyChanged(() => Vol1); }
+        }
+        private int _Cur1;
+        /// <summary>
+        /// 电流值1
+        /// </summary>
+        public int Cur1
+        {
+            get { return _Cur1; }
+            set { _Cur1 = value; RaisePropertyChanged(() => Cur1); }
+        }
+        private decimal _WeldTime1;
+        /// <summary>
+        /// 焊接时间1
+        /// </summary>
+        public decimal WeldTime1
+        {
+            get { return _WeldTime1; }
+            set { _WeldTime1 = value; RaisePropertyChanged(() => WeldTime1); }
+        }
+        private decimal _Vol2;
+        /// <summary>
+        /// 电压值2
+        /// </summary>
+        public decimal Vol2
+        {
+            get { return _Vol2; }
+            set { _Vol2 = value; RaisePropertyChanged(() => Vol2); }
+        }
+        private int _Cur2;
+        /// <summary>
+        /// 电流值2
+        /// </summary>
+        public int Cur2
+        {
+            get { return _Cur2; }
+            set { _Cur2 = value; RaisePropertyChanged(() => Cur2); }
+        }
+        private decimal _WeldTime2;
+        /// <summary>
+        /// 焊接时间2
+        /// </summary>
+        public decimal WeldTime2
+        {
+            get { return _WeldTime2; }
+            set { _WeldTime2 = value; RaisePropertyChanged(() => WeldTime2); }
+        }
+        private int _NozzleClean;
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        public int NozzleClean
+        {
+            get { return _NozzleClean; }
+            set { _NozzleClean = value; RaisePropertyChanged(() => NozzleClean); }
+        }
+        private int _NozzleReplace;
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        public int NozzleReplace
+        {
+            get { return _NozzleReplace; }
+            set { _NozzleReplace = value; RaisePropertyChanged(() => NozzleReplace); }
+        }
+        private string _Fixture;
+        /// <summary>
+        /// 夹具
+        /// </summary>
+        public string Fixture
+        {
+            get { return _Fixture; }
+            set { _Fixture = value; RaisePropertyChanged(() => Fixture); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 判定OK/NG
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPSealInstallDto.cs b/GroupLine.App/ModelDto/KPSealInstallDto.cs
new file mode 100644
index 0000000..6e6c6ef
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPSealInstallDto.cs
@@ -0,0 +1,311 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPSealInstallDto))]
+    public class KPSealInstallDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private string _SealCover;
+        /// <summary>
+        /// 密封盖板
+        /// </summary>
+        public string SealCover
+        {
+            get { return _SealCover; }
+            set { _SealCover = value; RaisePropertyChanged(() => SealCover); }
+        }
+
+        private decimal _Cycle;
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        public decimal Cycle
+        {
+            get { return _Cycle; }
+            set { _Cycle = value; RaisePropertyChanged(() => Cycle); }
+        }
+
+        private int _ScrewCount;
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        public int ScrewCount
+        {
+            get { return _ScrewCount; }
+            set { _ScrewCount = value; RaisePropertyChanged(() => ScrewCount); }
+        }
+
+        private decimal _FinalTorque;
+        /// <summary>
+        /// 最终扭矩
+        /// </summary>
+        public decimal FinalTorque
+        {
+            get { return _FinalTorque; }
+            set { _FinalTorque = value; RaisePropertyChanged(() => FinalTorque); }
+        }
+        private decimal _FinalAngle;
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        public decimal FinalAngle
+        {
+            get { return _FinalAngle; }
+            set { _FinalAngle = value; RaisePropertyChanged(() => FinalAngle); }
+        }
+
+
+        private decimal _FinalTorque2;
+        /// <summary>
+        /// 最终扭矩2
+        /// </summary>
+        public decimal FinalTorque2
+        {
+            get { return _FinalTorque2; }
+            set { _FinalTorque2 = value; RaisePropertyChanged(() => FinalTorque2); }
+        }
+        private decimal _FinalAngle2;
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        public decimal FinalAngle2
+        {
+            get { return _FinalAngle2; }
+            set { _FinalAngle2 = value; RaisePropertyChanged(() => FinalAngle2); }
+        }
+
+
+        private decimal _FinalTorque3;
+        /// <summary>
+        /// 最终扭矩3
+        /// </summary>
+        public decimal FinalTorque3
+        {
+            get { return _FinalTorque3; }
+            set { _FinalTorque3 = value; RaisePropertyChanged(() => FinalTorque3); }
+        }
+        private decimal _FinalAngle3;
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        public decimal FinalAngle3
+        {
+            get { return _FinalAngle3; }
+            set { _FinalAngle3 = value; RaisePropertyChanged(() => FinalAngle3); }
+        }
+
+        private decimal _FinalTorque4;
+        /// <summary>
+        /// 最终扭矩4
+        /// </summary>
+        public decimal FinalTorque4
+        {
+            get { return _FinalTorque4; }
+            set { _FinalTorque4 = value; RaisePropertyChanged(() => FinalTorque4); }
+        }
+        private decimal _FinalAngle4;
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        public decimal FinalAngle4
+        {
+            get { return _FinalAngle4; }
+            set { _FinalAngle4 = value; RaisePropertyChanged(() => FinalAngle4); }
+        }
+
+        private decimal _FinalTorque5;
+        /// <summary>
+        /// 最终扭矩5
+        /// </summary>
+        public decimal FinalTorque5
+        {
+            get { return _FinalTorque5; }
+            set { _FinalTorque5 = value; RaisePropertyChanged(() => FinalTorque5); }
+        }
+        private decimal _FinalAngle5;
+        /// <summary>
+        /// 最终角度5
+        /// </summary>
+        public decimal FinalAngle5
+        {
+            get { return _FinalAngle5; }
+            set { _FinalAngle5 = value; RaisePropertyChanged(() => FinalAngle5); }
+        }
+
+        private decimal _FinalTorque6;
+        /// <summary>
+        /// 最终扭矩6
+        /// </summary>
+        public decimal FinalTorque6
+        {
+            get { return _FinalTorque6; }
+            set { _FinalTorque6 = value; RaisePropertyChanged(() => FinalTorque6); }
+        }
+        private decimal _FinalAngle6;
+        /// <summary>
+        /// 最终角度6
+        /// </summary>
+        public decimal FinalAngle6
+        {
+            get { return _FinalAngle6; }
+            set { _FinalAngle6= value; RaisePropertyChanged(() => FinalAngle6); }
+        }
+
+        private decimal _FinalTorque7;
+        /// <summary>
+        /// 最终扭矩7
+        /// </summary>
+        public decimal FinalTorque7
+        {
+            get { return _FinalTorque7; }
+            set { _FinalTorque7 = value; RaisePropertyChanged(() => FinalTorque7); }
+        }
+        private decimal _FinalAngle7;
+        /// <summary>
+        /// 最终角度7
+        /// </summary>
+        public decimal FinalAngle7
+        {
+            get { return _FinalAngle7; }
+            set { _FinalAngle7 = value; RaisePropertyChanged(() => FinalAngle7); }
+        }
+
+
+        private decimal _FinalTorque8;
+        /// <summary>
+        /// 最终扭矩8
+        /// </summary>
+        public decimal FinalTorque8
+        {
+            get { return _FinalTorque8; }
+            set { _FinalTorque8 = value; RaisePropertyChanged(() => FinalTorque8); }
+        }
+        private decimal _FinalAngle8;
+        /// <summary>
+        /// 最终角度8
+        /// </summary>
+        public decimal FinalAngle8
+        {
+            get { return _FinalAngle8; }
+            set { _FinalAngle8 = value; RaisePropertyChanged(() => FinalAngle8); }
+        }
+
+        private decimal _FinalTorque9;
+        /// <summary>
+        /// 最终扭矩9
+        /// </summary>
+        public decimal FinalTorque9
+        {
+            get { return _FinalTorque9; }
+            set { _FinalTorque9 = value; RaisePropertyChanged(() => FinalTorque9); }
+        }
+        private decimal _FinalAngle9;
+        /// <summary>
+        /// 最终角度9
+        /// </summary>
+        public decimal FinalAngle9
+        {
+            get { return _FinalAngle9; }
+            set { _FinalAngle9 = value; RaisePropertyChanged(() => FinalAngle9); }
+        }
+
+        private decimal _FinalTorque10;
+        /// <summary>
+        /// 最终扭矩10
+        /// </summary>
+        public decimal FinalTorque10
+        {
+            get { return _FinalTorque10; }
+            set { _FinalTorque10 = value; RaisePropertyChanged(() => FinalTorque10); }
+        }
+        private decimal _FinalAngle10;
+        /// <summary>
+        /// 最终角度10
+        /// </summary>
+        public decimal FinalAngle10
+        {
+            get { return _FinalAngle10; }
+            set { _FinalAngle10 = value; RaisePropertyChanged(() => FinalAngle10); }
+        }
+
+        private decimal _FinalTorque11;
+        /// <summary>
+        /// 最终扭矩11
+        /// </summary>
+        public decimal FinalTorque11
+        {
+            get { return _FinalTorque11; }
+            set { _FinalTorque11 = value; RaisePropertyChanged(() => FinalTorque11); }
+        }
+        private decimal _FinalAngle11;
+        /// <summary>
+        /// 最终角度11
+        /// </summary>
+        public decimal FinalAngle11
+        {
+            get { return _FinalAngle11; }
+            set { _FinalAngle11 = value; RaisePropertyChanged(() => FinalAngle11); }
+        }
+
+        private decimal _FinalTorque12;
+        /// <summary>
+        /// 最终扭矩12
+        /// </summary>
+        public decimal FinalTorque12
+        {
+            get { return _FinalTorque12; }
+            set { _FinalTorque12 = value; RaisePropertyChanged(() => FinalTorque12); }
+        }
+        private decimal _FinalAngle12;
+        /// <summary>
+        /// 最终角度12
+        /// </summary>
+        public decimal FinalAngle12
+        {
+            get { return _FinalAngle12; }
+            set { _FinalAngle12 = value; RaisePropertyChanged(() => FinalAngle12); }
+        }
+
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPShrinkTubDto.cs b/GroupLine.App/ModelDto/KPShrinkTubDto.cs
new file mode 100644
index 0000000..93c2ad7
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPShrinkTubDto.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPShrinkTubDto))]
+    public class KPShrinkTubDto : ValidateModelBase
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private decimal _FinalLoad;
+        /// <summary>
+        /// 终负荷
+        /// </summary>
+        public decimal FinalLoad
+        {
+            get { return _FinalLoad; }
+            set { _FinalLoad = value; RaisePropertyChanged(() => FinalLoad); }
+        }
+        private decimal _FinalLocation;
+        /// <summary>
+        /// 终位置
+        /// </summary>
+        public decimal FinalLocation
+        {
+            get { return _FinalLocation; }
+            set { _FinalLocation = value; RaisePropertyChanged(() => FinalLocation); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPSpotWeldMachDto.cs b/GroupLine.App/ModelDto/KPSpotWeldMachDto.cs
new file mode 100644
index 0000000..df06ee7
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPSpotWeldMachDto.cs
@@ -0,0 +1,221 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPSpotWeldMachDto))]
+    public class KPSpotWeldMachDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _Vol1;
+        /// <summary>
+        /// 电压1
+        /// </summary>
+        public decimal Vol1
+        {
+            get { return _Vol1; }
+            set { _Vol1 = value; RaisePropertyChanged(() => Vol1); }
+        }
+private int  _Cur1;
+        /// <summary>
+        /// 电流1
+        /// </summary>
+        public int Cur1
+        {
+            get { return _Cur1; }
+            set { _Cur1 = value; RaisePropertyChanged(() => Cur1); }
+        }
+private decimal  _WeldTime1;
+        /// <summary>
+        /// 焊接时间1
+        /// </summary>
+        public decimal WeldTime1
+        {
+            get { return _WeldTime1; }
+            set { _WeldTime1 = value; RaisePropertyChanged(() => WeldTime1); }
+        }
+private decimal  _Vol2;
+        /// <summary>
+        /// 电压2
+        /// </summary>
+        public decimal Vol2
+        {
+            get { return _Vol2; }
+            set { _Vol2 = value; RaisePropertyChanged(() => Vol2); }
+        }
+private int  _Cur2;
+        /// <summary>
+        /// 电流2
+        /// </summary>
+        public int Cur2
+        {
+            get { return _Cur2; }
+            set { _Cur2 = value; RaisePropertyChanged(() => Cur2); }
+        }
+private decimal  _WeldTime2;
+        /// <summary>
+        /// 焊接时间2
+        /// </summary>
+        public decimal WeldTime2
+        {
+            get { return _WeldTime2; }
+            set { _WeldTime2 = value; RaisePropertyChanged(() => WeldTime2); }
+        }
+private decimal  _Vol3;
+        /// <summary>
+        /// 电压3
+        /// </summary>
+        public decimal Vol3
+        {
+            get { return _Vol3; }
+            set { _Vol3 = value; RaisePropertyChanged(() => Vol3); }
+        }
+private int  _Cur3;
+        /// <summary>
+        /// 电流3
+        /// </summary>
+        public int Cur3
+        {
+            get { return _Cur3; }
+            set { _Cur3 = value; RaisePropertyChanged(() => Cur3); }
+        }
+private decimal  _WeldTime3;
+        /// <summary>
+        /// 焊接时间3
+        /// </summary>
+        public decimal WeldTime3
+        {
+            get { return _WeldTime3; }
+            set { _WeldTime3 = value; RaisePropertyChanged(() => WeldTime3); }
+        }
+private decimal  _Vol4;
+        /// <summary>
+        /// 电压4
+        /// </summary>
+        public decimal Vol4
+        {
+            get { return _Vol4; }
+            set { _Vol4 = value; RaisePropertyChanged(() => Vol4); }
+        }
+private int  _Cur4;
+        /// <summary>
+        /// 电流4
+        /// </summary>
+        public int Cur4
+        {
+            get { return _Cur4; }
+            set { _Cur4 = value; RaisePropertyChanged(() => Cur4); }
+        }
+private decimal  _WeldTime4;
+        /// <summary>
+        /// 焊接时间4
+        /// </summary>
+        public decimal WeldTime4
+        {
+            get { return _WeldTime4; }
+            set { _WeldTime4 = value; RaisePropertyChanged(() => WeldTime4); }
+        }
+private decimal  _Vol5;
+        /// <summary>
+        /// 电压5
+        /// </summary>
+        public decimal Vol5
+        {
+            get { return _Vol5; }
+            set { _Vol5 = value; RaisePropertyChanged(() => Vol5); }
+        }
+private int  _Cur5;
+        /// <summary>
+        /// 电流5
+        /// </summary>
+        public int Cur5
+        {
+            get { return _Cur5; }
+            set { _Cur5 = value; RaisePropertyChanged(() => Cur5); }
+        }
+private decimal  _WeldTime5;
+        /// <summary>
+        /// 焊接时间5
+        /// </summary>
+        public decimal WeldTime5
+        {
+            get { return _WeldTime5; }
+            set { _WeldTime5 = value; RaisePropertyChanged(() => WeldTime5); }
+        }
+private decimal  _Vol6;
+        /// <summary>
+        /// 电压6
+        /// </summary>
+        public decimal Vol6
+        {
+            get { return _Vol6; }
+            set { _Vol6 = value; RaisePropertyChanged(() => Vol6); }
+        }
+private int  _Cur6;
+        /// <summary>
+        /// 电流6
+        /// </summary>
+        public int Cur6
+        {
+            get { return _Cur6; }
+            set { _Cur6 = value; RaisePropertyChanged(() => Cur6); }
+        }
+private decimal  _WeldTime6;
+        /// <summary>
+        /// 焊接时间6
+        /// </summary>
+        public decimal WeldTime6
+        {
+            get { return _WeldTime6; }
+            set { _WeldTime6 = value; RaisePropertyChanged(() => WeldTime6); }
+        }
+private int  _NozzleClean;
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        public int NozzleClean
+        {
+            get { return _NozzleClean; }
+            set { _NozzleClean = value; RaisePropertyChanged(() => NozzleClean); }
+        }
+private int  _NozzleReplace;
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        public int NozzleReplace
+        {
+            get { return _NozzleReplace; }
+            set { _NozzleReplace = value; RaisePropertyChanged(() => NozzleReplace); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPStaticDiskMachDto.cs b/GroupLine.App/ModelDto/KPStaticDiskMachDto.cs
new file mode 100644
index 0000000..d9b71f9
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPStaticDiskMachDto.cs
@@ -0,0 +1,332 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPStaticDiskMachDto))]
+    public class KPStaticDiskMachDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+
+
+        private string _MachineCode;
+        /// <summary>
+        /// 机型
+        /// </summary>
+        public string MachineCode
+        {
+            get { return _MachineCode; }
+            set { _MachineCode = value; RaisePropertyChanged(() => _MachineCode); }
+        }
+
+
+        private decimal _Cycle;
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        public decimal Cycle
+        {
+            get { return _Cycle; }
+            set { _Cycle = value; RaisePropertyChanged(() => Cycle); }
+        }
+
+        private int _ScrewCount;
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        public int ScrewCount
+        {
+            get { return _ScrewCount; }
+            set { _ScrewCount = value; RaisePropertyChanged(() => ScrewCount); }
+        }
+
+
+
+        private decimal _FinalTorque;
+        /// <summary>
+        /// 最终扭矩
+        /// </summary>
+        public decimal FinalTorque
+        {
+            get { return _FinalTorque; }
+            set { _FinalTorque = value; RaisePropertyChanged(() => FinalTorque); }
+        }
+        private decimal _FinalAngle;
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        public decimal FinalAngle
+        {
+            get { return _FinalAngle; }
+            set { _FinalAngle = value; RaisePropertyChanged(() => FinalAngle); }
+        }
+
+
+        private decimal _FinalTorque2;
+        /// <summary>
+        /// 最终扭矩2
+        /// </summary>
+        public decimal FinalTorque2
+        {
+            get { return _FinalTorque2; }
+            set { _FinalTorque2 = value; RaisePropertyChanged(() => FinalTorque2); }
+        }
+        private decimal _FinalAngle2;
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        public decimal FinalAngle2
+        {
+            get { return _FinalAngle2; }
+            set { _FinalAngle2 = value; RaisePropertyChanged(() => FinalAngle2); }
+        }
+
+
+        private decimal _FinalTorque3;
+        /// <summary>
+        /// 最终扭矩3
+        /// </summary>
+        public decimal FinalTorque3
+        {
+            get { return _FinalTorque3; }
+            set { _FinalTorque3 = value; RaisePropertyChanged(() => FinalTorque3); }
+        }
+        private decimal _FinalAngle3;
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        public decimal FinalAngle3
+        {
+            get { return _FinalAngle3; }
+            set { _FinalAngle3 = value; RaisePropertyChanged(() => FinalAngle3); }
+        }
+
+
+        private decimal _FinalTorque4;
+        /// <summary>
+        /// 最终扭矩4
+        /// </summary>
+        public decimal FinalTorque4
+        {
+            get { return _FinalTorque4; }
+            set { _FinalTorque4 = value; RaisePropertyChanged(() => FinalTorque4); }
+        }
+        private decimal _FinalAngle4;
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        public decimal FinalAngle4
+        {
+            get { return _FinalAngle4; }
+            set { _FinalAngle4 = value; RaisePropertyChanged(() => FinalAngle4); }
+        }
+
+
+        private decimal _FinalTorque5;
+        /// <summary>
+        /// 最终扭矩5
+        /// </summary>
+        public decimal FinalTorque5
+        {
+            get { return _FinalTorque5; }
+            set { _FinalTorque5 = value; RaisePropertyChanged(() => FinalTorque5); }
+        }
+        private decimal _FinalAngle5;
+        /// <summary>
+        /// 最终角度5
+        /// </summary>
+        public decimal FinalAngle5
+        {
+            get { return _FinalAngle5; }
+            set { _FinalAngle5 = value; RaisePropertyChanged(() => FinalAngle5); }
+        }
+
+
+        private decimal _FinalTorque6;
+        /// <summary>
+        /// 最终扭矩6
+        /// </summary>
+        public decimal FinalTorque6
+        {
+            get { return _FinalTorque6; }
+            set { _FinalTorque6 = value; RaisePropertyChanged(() => FinalTorque6); }
+        }
+        private decimal _FinalAngle6;
+        /// <summary>
+        /// 最终角度6
+        /// </summary>
+        public decimal FinalAngle6
+        {
+            get { return _FinalAngle6; }
+            set { _FinalAngle6 = value; RaisePropertyChanged(() => FinalAngle6); }
+        }
+
+
+        private decimal _FinalTorque7;
+        /// <summary>
+        /// 最终扭矩7
+        /// </summary>
+        public decimal FinalTorque7
+        {
+            get { return _FinalTorque7; }
+            set { _FinalTorque7 = value; RaisePropertyChanged(() => FinalTorque7); }
+        }
+        private decimal _FinalAngle7;
+        /// <summary>
+        /// 最终角度7
+        /// </summary>
+        public decimal FinalAngle7
+        {
+            get { return _FinalAngle7; }
+            set { _FinalAngle7 = value; RaisePropertyChanged(() => FinalAngle7); }
+        }
+
+
+        private decimal _FinalTorque8;
+        /// <summary>
+        /// 最终扭矩8
+        /// </summary>
+        public decimal FinalTorque8
+        {
+            get { return _FinalTorque8; }
+            set { _FinalTorque8 = value; RaisePropertyChanged(() => FinalTorque8); }
+        }
+        private decimal _FinalAngle8;
+        /// <summary>
+        /// 最终角度8
+        /// </summary>
+        public decimal FinalAngle8
+        {
+            get { return _FinalAngle8; }
+            set { _FinalAngle8 = value; RaisePropertyChanged(() => FinalAngle8); }
+        }
+
+
+        private decimal _FinalTorque9;
+        /// <summary>
+        /// 最终扭矩9
+        /// </summary>
+        public decimal FinalTorque9
+        {
+            get { return _FinalTorque9; }
+            set { _FinalTorque9 = value; RaisePropertyChanged(() => FinalTorque9); }
+        }
+        private decimal _FinalAngle9;
+        /// <summary>
+        /// 最终角度9
+        /// </summary>
+        public decimal FinalAngle9
+        {
+            get { return _FinalAngle9; }
+            set { _FinalAngle9 = value; RaisePropertyChanged(() => FinalAngle9); }
+        }
+
+        private decimal _FinalTorque10;
+        /// <summary>
+        /// 最终扭矩10
+        /// </summary>
+        public decimal FinalTorque10
+        {
+            get { return _FinalTorque10; }
+            set { _FinalTorque10 = value; RaisePropertyChanged(() => FinalTorque10); }
+        }
+        private decimal _FinalAngle10;
+        /// <summary>
+        /// 最终角度10
+        /// </summary>
+        public decimal FinalAngle10
+        {
+            get { return _FinalAngle10; }
+            set { _FinalAngle10 = value; RaisePropertyChanged(() => FinalAngle10); }
+        }
+
+
+        private decimal _FinalTorque11;
+        /// <summary>
+        /// 最终扭矩11
+        /// </summary>
+        public decimal FinalTorque11
+        {
+            get { return _FinalTorque11; }
+            set { _FinalTorque11 = value; RaisePropertyChanged(() => FinalTorque11); }
+        }
+        private decimal _FinalAngle11;
+        /// <summary>
+        /// 最终角度11
+        /// </summary>
+        public decimal FinalAngle11
+        {
+            get { return _FinalAngle11; }
+            set { _FinalAngle11 = value; RaisePropertyChanged(() => FinalAngle11); }
+        }
+
+
+        private decimal _FinalTorque12;
+        /// <summary>
+        /// 最终扭矩12
+        /// </summary>
+        public decimal FinalTorque12
+        {
+            get { return _FinalTorque12; }
+            set { _FinalTorque12 = value; RaisePropertyChanged(() => FinalTorque12); }
+        }
+        private decimal _FinalAngle12;
+        /// <summary>
+        /// 最终角度12
+        /// </summary>
+        public decimal FinalAngle12
+        {
+            get { return _FinalAngle12; }
+            set { _FinalAngle12 = value; RaisePropertyChanged(() => FinalAngle12); }
+        }
+
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KPUpBurnEbDto.cs b/GroupLine.App/ModelDto/KPUpBurnEbDto.cs
new file mode 100644
index 0000000..7a8e7fe
--- /dev/null
+++ b/GroupLine.App/ModelDto/KPUpBurnEbDto.cs
@@ -0,0 +1,82 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(KPUpBurnEbDto))]
+    public class KPUpBurnEbDto : ValidateModelBase
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _CrankshaftNo;
+        /// <summary>
+        /// 曲轴编号
+        /// </summary>
+        public string CrankshaftNo
+        {
+            get { return _CrankshaftNo; }
+            set { _CrankshaftNo = value; RaisePropertyChanged(() => CrankshaftNo); }
+        }
+
+        private decimal _ProbeA;
+        /// <summary>
+        /// 测头A
+        /// </summary>
+        public decimal ProbeA
+        {
+            get { return _ProbeA; }
+            set { _ProbeA = value; RaisePropertyChanged(() => ProbeA); }
+        }
+
+        private decimal _ProbeB;
+        /// <summary>
+        /// 测头B
+        /// </summary>
+        public decimal ProbeB
+        {
+            get { return _ProbeB; }
+            set { _ProbeB = value; RaisePropertyChanged(() => ProbeB); }
+        }
+
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+
+
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/KanBan/PlanCountDto.cs b/GroupLine.App/ModelDto/KanBan/PlanCountDto.cs
new file mode 100644
index 0000000..8bac841
--- /dev/null
+++ b/GroupLine.App/ModelDto/KanBan/PlanCountDto.cs
@@ -0,0 +1,97 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(PlanCountDto))]
+    public class PlanCountDto : ValidateModelBase
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        private Guid _ID;
+        public Guid ID
+        {
+            get { return _ID; }
+            set { _ID = value; RaisePropertyChanged(() => ID); }
+        }
+
+        /// <summary>
+        /// 计划日期
+        /// </summary>
+        private DateTime _PlanDate;
+        [Required]
+        public DateTime PlanDate
+        {
+            get { return _PlanDate; }
+            set { _PlanDate = value; RaisePropertyChanged(() => PlanDate); }
+        }
+
+        /// <summary>
+        /// 班次
+        /// </summary>
+        private string _ClassNum;
+        [Required]
+        public string ClassNum
+        {
+            get { return _ClassNum; }
+            set { _ClassNum = value; RaisePropertyChanged(() => ClassNum); }
+        }
+
+        /// <summary>
+        /// 前组产量
+        /// </summary>
+        private int _AGroup;
+        [Required]
+        public int AGroup
+        {
+            get { return _AGroup; }
+            set { _AGroup = value; RaisePropertyChanged(() => AGroup); }
+        }
+
+        /// <summary>
+        /// 后装产量
+        /// </summary>
+        private int _BGroup;
+        [Required]
+        public int BGroup
+        {
+            get { return _BGroup; }
+            set { _BGroup = value; RaisePropertyChanged(() => BGroup); }
+        }
+
+
+        /// <summary>
+        /// 组装产量
+        /// </summary>
+        private int _CGroup;
+        [Required]
+        public int CGroup
+        {
+            get { return _CGroup; }
+            set { _CGroup = value; RaisePropertyChanged(() => CGroup); }
+        }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        private DateTime _CreateTime;
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+        private bool isFormValid;
+        /// <summary>
+        /// 是否全局验证
+        /// </summary>
+        public bool IsFormValid
+        {
+            get { return isFormValid; }
+            set { isFormValid = value; RaisePropertyChanged(() => IsFormValid); }
+        }
+    }
+
+}
diff --git a/GroupLine.App/ModelDto/KanBan/WorkTimeDto.cs b/GroupLine.App/ModelDto/KanBan/WorkTimeDto.cs
new file mode 100644
index 0000000..70397b0
--- /dev/null
+++ b/GroupLine.App/ModelDto/KanBan/WorkTimeDto.cs
@@ -0,0 +1,86 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(WorkTimeDto))]
+    public class WorkTimeDto : ValidateModelBase
+    {
+        /// <summary>
+        /// ID
+        /// </summary>
+        private Guid _ID;
+        public Guid ID
+        {
+            get { return _ID; }
+            set { _ID = value; RaisePropertyChanged(() => ID); }
+        }
+
+        /// <summary>
+        /// 班次
+        /// </summary>
+        private string _ClassNum;
+        //[Required]
+        public string ClassNum
+        {
+            get { return _ClassNum; }
+            set { _ClassNum = value; RaisePropertyChanged(() => ClassNum); }
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        private string _Index;
+        //[Required]
+        public string Index
+        {
+            get { return _Index; }
+            set { _Index = value; RaisePropertyChanged(() => Index); }
+        }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        private string _StartTime;
+        //[Required]
+        //[RegularExpression(@"^(\d|[01]\d|2[0-3]):(\d|[0-5]\d):(\d|[0-5]\d)$", ErrorMessage = "请输入正确的时间格式")]
+        public string StartTime
+        {
+            get { return _StartTime; }
+            set { _StartTime = value; RaisePropertyChanged(() => StartTime); }
+        }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        private string _EndTime;
+        //[Required]
+        // [RegularExpression(@"^(\d|[01]\d|2[0-3]):(\d|[0-5]\d):(\d|[0-5]\d)$", ErrorMessage = "请输入正确的时间格式")]
+        public string EndTime
+        {
+            get { return _EndTime; }
+            set { _EndTime = value; RaisePropertyChanged(() => EndTime); }
+        }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        private DateTime _CreateTime;
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+        private bool isFormValid;
+        /// <summary>
+        /// 是否全局验证
+        /// </summary>
+        public bool IsFormValid
+        {
+            get { return isFormValid; }
+            set { isFormValid = value; RaisePropertyChanged(() => IsFormValid); }
+        }
+    }
+
+}
diff --git a/GroupLine.App/ModelDto/MagTorqueDto.cs b/GroupLine.App/ModelDto/MagTorqueDto.cs
new file mode 100644
index 0000000..94d87ff
--- /dev/null
+++ b/GroupLine.App/ModelDto/MagTorqueDto.cs
@@ -0,0 +1,70 @@
+using GroupLine.App.ModelDto;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App
+{
+    [MetadataType(typeof(MagTorqueDto))]
+    public class MagTorqueDto : ValidateModelBase
+    {
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+
+        private string _ModelType;
+        /// <summary>
+        /// 机种类型
+        /// </summary>
+        public string ModelType
+        {
+            get { return _ModelType; }
+            set { _ModelType = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+
+
+        
+        private decimal _MagValue;
+        /// <summary>
+        /// 磁束值
+        /// </summary>
+        public decimal MagValue
+        {
+            get { return _MagValue; }
+            set { _MagValue = value; RaisePropertyChanged(() => MagValue); }
+        }
+        private decimal _TorqueValue;
+        /// <summary>
+        /// 扭矩值
+        /// </summary>
+        public decimal TorqueValue
+        {
+            get { return _TorqueValue; }
+            set { _TorqueValue = value; RaisePropertyChanged(() => TorqueValue); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 结果
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/OilPumpInstallDto.cs b/GroupLine.App/ModelDto/OilPumpInstallDto.cs
new file mode 100644
index 0000000..f767ee0
--- /dev/null
+++ b/GroupLine.App/ModelDto/OilPumpInstallDto.cs
@@ -0,0 +1,88 @@
+using GroupLine.App.ModelDto;
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App
+{
+    [MetadataType(typeof(OilPumpInstallDto))]
+    public class OilPumpInstallDto : ValidateModelBase
+    {
+        private string _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+
+
+        private string _ModelType;
+        /// <summary>
+        /// 机种类型
+        /// </summary>
+        public string ModelType
+        {
+            get { return _ModelType; }
+            set { _ModelType = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+
+        private string _OilPumpNo;
+        /// <summary>
+        /// 油泵编号
+        /// </summary>
+        public string OilPumpNo
+        {
+            get { return _OilPumpNo; }
+            set { _OilPumpNo = value; RaisePropertyChanged(() => OilPumpNo); }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private int _OilPumpDmge;
+        /// <summary>
+        /// 油泵磕伤确认
+        /// </summary>
+        public int OilPumpDmge
+        {
+            get { return _OilPumpDmge; }
+            set { _OilPumpDmge = value; RaisePropertyChanged(() => OilPumpDmge); }
+        }
+        private int _Repair;
+        /// <summary>
+        /// 是否是返修品
+        /// </summary>
+        public int Repair
+        {
+            get { return _Repair; }
+            set { _Repair = value; RaisePropertyChanged(() => Repair); }
+        }
+        private string _Result;
+        /// <summary>
+        /// 结果
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/OverflowLeakMesDto.cs b/GroupLine.App/ModelDto/OverflowLeakMesDto.cs
new file mode 100644
index 0000000..853c631
--- /dev/null
+++ b/GroupLine.App/ModelDto/OverflowLeakMesDto.cs
@@ -0,0 +1,191 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(OverflowLeakMesDto))]
+    public class OverflowLeakMesDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _MachineCode;
+        /// <summary>
+        /// 机型
+        /// </summary>
+        public string MachineCode
+        {
+            get { return _MachineCode; }
+            set { _MachineCode = value; RaisePropertyChanged(() => _MachineCode); }
+        }
+
+        private string _StaticDiskNo;
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        public string StaticDiskNo
+        {
+            get { return _StaticDiskNo; }
+            set { _StaticDiskNo = value; RaisePropertyChanged(() => StaticDiskNo); }
+        }
+
+        private string _DynaDiskNo;
+        /// <summary>
+        /// 动盘编号
+        /// </summary>
+        public string DynaDiskNo
+        {
+            get { return _DynaDiskNo; }
+            set { _DynaDiskNo = value; RaisePropertyChanged(() => _DynaDiskNo); }
+        }
+
+
+        private decimal _Cycle;
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        public decimal Cycle
+        {
+            get { return _Cycle; }
+            set { _Cycle = value; RaisePropertyChanged(() => Cycle); }
+        }
+
+        private int _ScrewCount;
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        public int ScrewCount
+        {
+            get { return _ScrewCount; }
+            set { _ScrewCount = value; RaisePropertyChanged(() => ScrewCount); }
+        }
+
+
+        //private string _StaticDiskNo;
+        ///// <summary>
+        ///// 静盘编号
+        ///// </summary>
+        //public string StaticDiskNo
+        //{
+        //    get { return _StaticDiskNo; }
+        //    set { _StaticDiskNo = value; RaisePropertyChanged(() => StaticDiskNo); }
+        //}
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+
+        private decimal _OverflowTorque;
+        /// <summary>
+        /// 溢流阀扭矩
+        /// </summary>
+        public decimal OverflowTorque
+        {
+            get { return _OverflowTorque; }
+            set { _OverflowTorque = value; RaisePropertyChanged(() => OverflowTorque); }
+        }
+        private decimal _FinalAngle;
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        public decimal FinalAngle
+        {
+            get { return _FinalAngle; }
+            set { _FinalAngle = value; RaisePropertyChanged(() => FinalAngle); }
+        }
+
+
+        private decimal _OverflowTorque2;
+        /// <summary>
+        /// 溢流阀扭矩2
+        /// </summary>
+        public decimal OverflowTorque2
+        {
+            get { return _OverflowTorque2; }
+            set { _OverflowTorque2 = value; RaisePropertyChanged(() => OverflowTorque2); }
+        }
+        private decimal _FinalAngle2;
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        public decimal FinalAngle2
+        {
+            get { return _FinalAngle2; }
+            set { _FinalAngle2 = value; RaisePropertyChanged(() => FinalAngle2); }
+        }
+
+
+        private decimal _OverflowTorque3;
+        /// <summary>
+        /// 溢流阀扭矩3
+        /// </summary>
+        public decimal OverflowTorque3
+        {
+            get { return _OverflowTorque3; }
+            set { _OverflowTorque3 = value; RaisePropertyChanged(() => OverflowTorque3); }
+        }
+        private decimal _FinalAngle3;
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        public decimal FinalAngle3
+        {
+            get { return _FinalAngle3; }
+            set { _FinalAngle3 = value; RaisePropertyChanged(() => FinalAngle3); }
+        }
+
+
+        private decimal _OverflowTorque4;
+        /// <summary>
+        /// 溢流阀扭矩4
+        /// </summary>
+        public decimal OverflowTorque4
+        {
+            get { return _OverflowTorque4; }
+            set { _OverflowTorque4 = value; RaisePropertyChanged(() => OverflowTorque4); }
+        }
+        private decimal _FinalAngle4;
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        public decimal FinalAngle4
+        {
+            get { return _FinalAngle4; }
+            set { _FinalAngle4 = value; RaisePropertyChanged(() => FinalAngle4); }
+        }
+
+
+        private string _Result;
+        /// <summary>
+        /// 判定
+        /// </summary>
+        public string Result
+        {
+            get { return _Result; }
+            set { _Result = value; RaisePropertyChanged(() => Result); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/PCoreMesDto.cs b/GroupLine.App/ModelDto/PCoreMesDto.cs
new file mode 100644
index 0000000..f4d7f8d
--- /dev/null
+++ b/GroupLine.App/ModelDto/PCoreMesDto.cs
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(PCoreMesDto))]
+    public class PCoreMesDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private decimal  _CoreOutput;
+        /// <summary>
+        /// 芯出测量值
+        /// </summary>
+        public decimal CoreOutput
+        {
+            get { return _CoreOutput; }
+            set { _CoreOutput = value; RaisePropertyChanged(() => CoreOutput); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/PLowWeldDto.cs b/GroupLine.App/ModelDto/PLowWeldDto.cs
new file mode 100644
index 0000000..95ba474
--- /dev/null
+++ b/GroupLine.App/ModelDto/PLowWeldDto.cs
@@ -0,0 +1,113 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(PLowWeldDto))]
+    public class PLowWeldDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private string  _CrankshaftNo;
+        /// <summary>
+        /// 曲轴编号
+        /// </summary>
+        public string CrankshaftNo
+        {
+            get { return _CrankshaftNo; }
+            set { _CrankshaftNo = value; RaisePropertyChanged(() => CrankshaftNo); }
+        }
+private string  _DownNo;
+        /// <summary>
+        /// 下部编号
+        /// </summary>
+        public string DownNo
+        {
+            get { return _DownNo; }
+            set { _DownNo = value; RaisePropertyChanged(() => DownNo); }
+        }
+private string  _DoCastNo;
+        /// <summary>
+        /// 下部铸件编号
+        /// </summary>
+        public string DoCastNo
+        {
+            get { return _DoCastNo; }
+            set { _DoCastNo = value; RaisePropertyChanged(() => DoCastNo); }
+        }
+private decimal  _StatorPressDep;
+        /// <summary>
+        /// 定子压入深度
+        /// </summary>
+        public decimal StatorPressDep
+        {
+            get { return _StatorPressDep; }
+            set { _StatorPressDep = value; RaisePropertyChanged(() => StatorPressDep); }
+        }
+private decimal  _RotorPressDep;
+        /// <summary>
+        /// 转子压入深度
+        /// </summary>
+        public decimal RotorPressDep
+        {
+            get { return _RotorPressDep; }
+            set { _RotorPressDep = value; RaisePropertyChanged(() => RotorPressDep); }
+        }
+private string  _FelerGgeResult;
+        /// <summary>
+        /// 塞尺检查（OK）
+        /// </summary>
+        public string FelerGgeResult
+        {
+            get { return _FelerGgeResult; }
+            set { _FelerGgeResult = value; RaisePropertyChanged(() => FelerGgeResult); }
+        }
+private string  _MagnetResult;
+        /// <summary>
+        /// 磁石检查（OK)
+        /// </summary>
+        public string MagnetResult
+        {
+            get { return _MagnetResult; }
+            set { _MagnetResult = value; RaisePropertyChanged(() => MagnetResult); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/PRacktPressDto.cs b/GroupLine.App/ModelDto/PRacktPressDto.cs
new file mode 100644
index 0000000..3b61736
--- /dev/null
+++ b/GroupLine.App/ModelDto/PRacktPressDto.cs
@@ -0,0 +1,77 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(PRacktPressDto))]
+    public class PRacktPressDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private string  _RacktNo;
+        /// <summary>
+        /// 支架编号
+        /// </summary>
+        public string RacktNo
+        {
+            get { return _RacktNo; }
+            set { _RacktNo = value; RaisePropertyChanged(() => RacktNo); }
+        }
+private decimal  _PressValue;
+        /// <summary>
+        /// 压入压力
+        /// </summary>
+        public decimal PressValue
+        {
+            get { return _PressValue; }
+            set { _PressValue = value; RaisePropertyChanged(() => PressValue); }
+        }
+private string  _TrayNo;
+        /// <summary>
+        /// 托盘编号
+        /// </summary>
+        public string TrayNo
+        {
+            get { return _TrayNo; }
+            set { _TrayNo = value; RaisePropertyChanged(() => TrayNo); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/PRacktWeldDto.cs b/GroupLine.App/ModelDto/PRacktWeldDto.cs
new file mode 100644
index 0000000..b36e761
--- /dev/null
+++ b/GroupLine.App/ModelDto/PRacktWeldDto.cs
@@ -0,0 +1,59 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(PRacktWeldDto))]
+    public class PRacktWeldDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string  _CylinderNo;
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        public string CylinderNo
+        {
+            get { return _CylinderNo; }
+            set { _CylinderNo = value; RaisePropertyChanged(() => CylinderNo); }
+        }
+private string  _TrayNo;
+        /// <summary>
+        /// 托盘编号
+        /// </summary>
+        public string TrayNo
+        {
+            get { return _TrayNo; }
+            set { _TrayNo = value; RaisePropertyChanged(() => TrayNo); }
+        }
+private string  _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+private DateTime  _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/StaticDiscPressDto.cs b/GroupLine.App/ModelDto/StaticDiscPressDto.cs
new file mode 100644
index 0000000..ea8da6c
--- /dev/null
+++ b/GroupLine.App/ModelDto/StaticDiscPressDto.cs
@@ -0,0 +1,100 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(StaticDiscPressDto))]
+    public class StaticDiscPressDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+        private string _StaticDiskNo;
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        public string StaticDiskNo
+        {
+            get { return _StaticDiskNo; }
+            set
+            {
+                _StaticDiskNo = value; RaisePropertyChanged(() => StaticDiskNo);
+            }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+
+        private decimal _PressValue;
+        /// <summary>
+        /// 压力值
+        /// </summary>
+        public decimal PressValue
+        {
+            get { return _PressValue; }
+            set { _PressValue = value; RaisePropertyChanged(() => PressValue); }
+        }
+
+        private decimal _PressDepth;
+        /// <summary>
+        /// 压入深度
+        /// </summary>
+        public decimal PressDepth
+        {
+            get { return _PressDepth; }
+            set { _PressDepth = value; RaisePropertyChanged(() => PressDepth); }
+        }
+
+        private string _PressStation;
+        /// <summary>
+        /// 压入工位
+        /// </summary>
+        public string PressStation
+        {
+            get { return _PressStation; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _PressStation = "左工位";
+                        break;
+                    case "2":
+                        _PressStation = "右工位";
+                        break;
+                    default:
+                        _PressStation = "无";
+                        break;
+                }
+                RaisePropertyChanged(() => PressStation);
+            }
+        }
+
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+
+
+    }
+}
diff --git a/GroupLine.App/ModelDto/TermWeldDto.cs b/GroupLine.App/ModelDto/TermWeldDto.cs
new file mode 100644
index 0000000..77830f0
--- /dev/null
+++ b/GroupLine.App/ModelDto/TermWeldDto.cs
@@ -0,0 +1,102 @@
+using System;
+using System.ComponentModel.DataAnnotations;
+
+namespace GroupLine.App.ModelDto
+{
+    [MetadataType(typeof(TermWeldDto))]
+    public class TermWeldDto : ValidateModelBase
+    {
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        private long _Id;
+        public long Id
+        {
+            get { return _Id; }
+            set { _Id = value; RaisePropertyChanged(() => Id); }
+        }
+
+
+        private string _MachineModel;
+        /// <summary>
+        /// 机种名
+        /// </summary>
+        public string MachineModel
+        {
+            get { return _MachineModel; }
+            set { _MachineModel = value; RaisePropertyChanged(() => MachineModel); }
+        }
+        private string _WeldStation;
+        /// <summary>
+        /// 焊接工位
+        /// </summary>
+        public string WeldStation
+        {
+            get { return _WeldStation; }
+            set
+            {
+                switch (value)
+                {
+                    case "1":
+                        _WeldStation = "左工位";
+                        break;
+                    case "2":
+                        _WeldStation = "右工位";
+                        break;
+                    default:
+                        _WeldStation = "无";
+                        break;
+                }
+                RaisePropertyChanged(() => WeldStation);
+            }
+        }
+        private string _OpNo;
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        public string OpNo
+        {
+            get { return _OpNo; }
+            set { _OpNo = value; RaisePropertyChanged(() => OpNo); }
+        }
+        private decimal _Cur;
+        /// <summary>
+        /// 电流值
+        /// </summary>
+        public decimal Cur
+        {
+            get { return _Cur; }
+            set { _Cur = value; RaisePropertyChanged(() => Cur); }
+        }
+        private int _ElectrodeModel;
+        /// <summary>
+        /// 电极型号
+        /// </summary>
+        public int ElectrodeModel
+        {
+            get { return _ElectrodeModel; }
+            set { _ElectrodeModel = value; RaisePropertyChanged(() => ElectrodeModel); }
+        }
+        private DateTime _CreateTime;
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime
+        {
+            get { return _CreateTime; }
+            set { _CreateTime = value; RaisePropertyChanged(() => CreateTime); }
+        }
+
+        private decimal _WeldTime;
+        /// <summary>
+        /// 焊接时间
+        /// </summary>
+        public decimal WeldTime
+        {
+            get { return _WeldTime; }
+            set { _WeldTime = value; RaisePropertyChanged(() => WeldTime); }
+        }
+        
+    }
+}
diff --git a/GroupLine.App/ModelDto/ValidateModelBase.cs b/GroupLine.App/ModelDto/ValidateModelBase.cs
new file mode 100644
index 0000000..74cfb06
--- /dev/null
+++ b/GroupLine.App/ModelDto/ValidateModelBase.cs
@@ -0,0 +1,90 @@
+using GalaSoft.MvvmLight;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using System.Linq;
+
+namespace GroupLine.App.ModelDto
+{
+    public class ValidateModelBase : ObservableObject, IDataErrorInfo
+    {
+        public ValidateModelBase()
+        {
+
+        }
+
+        #region 属性 
+        /// <summary>
+        /// 表当验证错误集合
+        /// </summary>
+        public Dictionary<String, String> dataErrors = new Dictionary<String, String>();
+
+        /// <summary>
+        /// 是否验证通过
+        /// </summary>
+        public Boolean IsValidated
+        {
+            get
+            {
+                if (dataErrors != null && dataErrors.Count > 0)
+                {
+                    return false;
+                }
+                return true;
+            }
+        }
+        #endregion
+
+        public string this[string columnName]
+        {
+            get
+            {
+                ValidationContext vc = new ValidationContext(this, null, null);
+                vc.MemberName = columnName;
+                var res = new List<ValidationResult>();
+                var result = Validator.TryValidateProperty(this.GetType().GetProperty(columnName).GetValue(this, null), vc, res);
+                if (res.Count > 0)
+                {
+                    String errorInfo = string.Join(Environment.NewLine, res.Select(r => r.ErrorMessage).ToArray());
+                    AddDic(dataErrors, columnName, errorInfo);
+                    return errorInfo;
+                }
+                RemoveDic(dataErrors, columnName);
+                return null;
+            }
+        }
+
+        public string Error
+        {
+            get
+            {
+                return null;
+            }
+        }
+
+
+        #region 附属方法
+
+        /// <summary>
+        /// 移除字典
+        /// </summary>
+        /// <param name="dics"></param>
+        /// <param name="dicKey"></param>
+        private void RemoveDic(Dictionary<String, String> dics, String dicKey)
+        {
+            dics.Remove(dicKey);
+        }
+
+        /// <summary>
+        /// 添加字典
+        /// </summary>
+        /// <param name="dics"></param>
+        /// <param name="dicKey"></param>
+        private void AddDic(Dictionary<String, String> dics, String dicKey, string dicValue)
+        {
+            if (!dics.ContainsKey(dicKey)) dics.Add(dicKey, dicValue);
+        }
+        #endregion
+    }
+}
diff --git a/GroupLine.App/NLog.config b/GroupLine.App/NLog.config
new file mode 100644
index 0000000..25e34dc
--- /dev/null
+++ b/GroupLine.App/NLog.config
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
+      autoReload="true"
+      throwExceptions="false"
+      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
+
+  <!-- optional, add some variables
+  https://github.com/nlog/NLog/wiki/Configuration-file#variables
+  -->
+  <variable name="myvar" value="myvalue"/>
+	<variable name="logDirectory" value="${basedir}/Log/${shortdate}"/>
+	<variable name="ActionDirectory" value="${basedir}/OperationLogs/${shortdate}"/>
+	
+  <!--
+  See https://github.com/nlog/nlog/wiki/Configuration-file
+  for information on customizing logging rules and outputs.
+   -->
+  <targets>
+
+    <!--
+    add your targets here
+    See https://github.com/nlog/NLog/wiki/Targets for possible targets.
+    See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
+    -->
+	  <target xsi:type="File" name="GroupLineApp" fileName="${logDirectory}/ErrorMessage.txt"  archiveAboveSize="10240000" maxArchiveFiles="200"
+				layout="${longdate}        ■${level}${newline}    ▲${stacktrace}${newline}     ◆${message}${newline}${newline}***************************************************************************" />
+
+	  <target xsi:type="File" name="GroupLineAppOperation" fileName="${ActionDirectory}/OperationLog.txt"  archiveAboveSize="10240000" maxArchiveFiles="500"
+			layout="${longdate}        ■${level}${newline}    ◆${message}${newline}***************************************************************************" />
+    <!--
+    Write events to a file with the date in the filename.
+    <target xsi:type="File" name="f" fileName="${basedir}/logs/${shortdate}.log"
+            layout="${longdate} ${uppercase:${level}} ${message}" />
+    -->
+  </targets>
+
+  <rules>
+    <!-- add your logging rules here -->
+	  <logger name="*" minlevel="Error" writeTo="GroupLineApp" />
+	  <logger name="*" minlevel="Info" maxlevel="Info" writeTo="GroupLineAppOperation" />
+    <!--
+    Write all events with minimal level of Debug (So Debug, Info, Warn, Error and Fatal, but not Trace)  to "f"
+    <logger name="*" minlevel="Debug" writeTo="f" />
+    -->
+  </rules>
+</nlog>
diff --git a/GroupLine.App/NLog.xsd b/GroupLine.App/NLog.xsd
new file mode 100644
index 0000000..d167472
--- /dev/null
+++ b/GroupLine.App/NLog.xsd
@@ -0,0 +1,3728 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema id="NLog" targetNamespace="http://www.nlog-project.org/schemas/NLog.xsd" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://www.nlog-project.org/schemas/NLog.xsd">
+  <xs:element name="nlog" type="NLogConfiguration" />
+  <xs:complexType name="NLogConfiguration">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="extensions" type="NLogExtensions" />
+      <xs:element name="include" type="NLogInclude" />
+      <xs:element name="variable" type="NLogVariable" />
+      <xs:element name="targets" type="NLogTargets" />
+      <xs:element name="rules" type="NLogRules" />
+      <xs:element name="time" type="TimeSource" />
+    </xs:choice>
+    <xs:attribute name="autoReload" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Watch config file for changes and reload automatically.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogToConsole" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Print internal NLog messages to the console. Default value is: false</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogToConsoleError" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Print internal NLog messages to the console error output. Default value is: false</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogFile" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Write internal NLog messages to the specified file.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogLevel" type="NLogLevel">
+      <xs:annotation>
+        <xs:documentation>Log level threshold for internal log messages. Default value is: Info.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="globalThreshold" type="NLogLevel">
+      <xs:annotation>
+        <xs:documentation>Global log level threshold for application log messages. Messages below this level won't be logged.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="throwExceptions" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Throw an exception when there is an internal error. Default value is: false. Not recommend to set to true in production!</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="throwConfigExceptions" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Throw an exception when there is a configuration error. If not set, determined by throwExceptions.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="keepVariablesOnReload" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Gets or sets a value indicating whether Variables should be kept on configuration reload. Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogToTrace" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Write internal NLog messages to the System.Diagnostics.Trace. Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="internalLogIncludeTimestamp" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Write timestamps for internal NLog messages. Default value is: true.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="useInvariantCulture" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Use InvariantCulture as default culture instead of CurrentCulture.  Default value is: false.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="parseMessageTemplates" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Perform message template parsing and formatting of LogEvent messages (true = Always, false = Never, empty = Auto Detect). Default value is: empty.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLogTargets">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="default-wrapper" type="WrapperTargetBase" />
+      <xs:element name="default-target-parameters" type="Target" />
+      <xs:element name="target" type="Target" />
+      <xs:element name="wrapper-target" type="WrapperTargetBase" />
+      <xs:element name="compound-target" type="CompoundTargetBase" />
+    </xs:choice>
+    <xs:attribute name="async" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Make all targets within this section asynchronous (creates additional threads but the calling thread isn't blocked by any target writes).</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLogRules">
+    <xs:sequence minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="logger" type="NLogLoggerRule" />
+    </xs:sequence>
+  </xs:complexType>
+  <xs:complexType name="NLogExtensions">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="add" type="NLogExtensionsAdd" />
+    </xs:choice>
+  </xs:complexType>
+  <xs:complexType name="NLogExtensionsAdd">
+    <xs:attribute name="prefix" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Prefix for targets/layout renderers/filters/conditions loaded from this assembly.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="assemblyFile" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Load NLog extensions from the specified file (*.dll)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="assembly" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Load NLog extensions from the specified assembly. Assembly name should be fully qualified.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLogLoggerRule">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="filters" type="NLogFilters" />
+    </xs:choice>
+    <xs:attribute name="name" use="optional">
+      <xs:annotation>
+        <xs:documentation>Filter on the name of the logger. May include wildcard characters ('*' or '?').</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="levels" type="NLogLevelList">
+      <xs:annotation>
+        <xs:documentation>Comma separated list of levels that this rule matches.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="minlevel" type="NLogLevel">
+      <xs:annotation>
+        <xs:documentation>Minimum level that this rule matches.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maxlevel" type="NLogLevel">
+      <xs:annotation>
+        <xs:documentation>Maximum level that this rule matches.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="level" type="NLogLevel">
+      <xs:annotation>
+        <xs:documentation>Level that this rule matches.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="writeTo" type="NLogTargetIDList">
+      <xs:annotation>
+        <xs:documentation>Comma separated list of target names.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="final" type="xs:boolean" default="false">
+      <xs:annotation>
+        <xs:documentation>Ignore further rules if this one matches.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="enabled" type="xs:boolean" default="true">
+      <xs:annotation>
+        <xs:documentation>Enable this rule. Note: disabled rules aren't available from the API.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ruleName" type="xs:string" use="optional">
+      <xs:annotation>
+        <xs:documentation>Rule identifier to allow rule lookup with Configuration.FindRuleByName and Configuration.RemoveRuleByName.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLogFilters">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="when" type="when" />
+      <xs:element name="whenContains" type="whenContains" />
+      <xs:element name="whenEqual" type="whenEqual" />
+      <xs:element name="whenNotContains" type="whenNotContains" />
+      <xs:element name="whenNotEqual" type="whenNotEqual" />
+      <xs:element name="whenRepeated" type="whenRepeated" />
+    </xs:choice>
+    <xs:attribute name="defaultAction" type="FilterResult">
+      <xs:annotation>
+        <xs:documentation>Default action if none of the filters match.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:simpleType name="NLogLevel">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Off" />
+      <xs:enumeration value="Trace" />
+      <xs:enumeration value="Debug" />
+      <xs:enumeration value="Info" />
+      <xs:enumeration value="Warn" />
+      <xs:enumeration value="Error" />
+      <xs:enumeration value="Fatal" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="LineEndingMode">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Default" />
+      <xs:enumeration value="CRLF" />
+      <xs:enumeration value="CR" />
+      <xs:enumeration value="LF" />
+      <xs:enumeration value="None" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLogLevelList">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="(|Trace|Debug|Info|Warn|Error|Fatal)(,(Trace|Debug|Info|Warn|Error|Fatal))*" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="NLogInclude">
+    <xs:attribute name="file" type="SimpleLayoutAttribute" use="required">
+      <xs:annotation>
+        <xs:documentation>Name of the file to be included. You could use * wildcard. The name is relative to the name of the current config file.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ignoreErrors" type="xs:boolean" use="optional" default="false">
+      <xs:annotation>
+        <xs:documentation>Ignore any errors in the include file.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLogVariable">
+    <xs:choice minOccurs="0" maxOccurs="1">
+      <xs:element name="value" minOccurs="0" maxOccurs="1" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>Variable value. Note, the 'value' attribute has precedence over this one.</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+    </xs:choice>
+    <xs:attribute name="name" type="xs:string" use="required">
+      <xs:annotation>
+        <xs:documentation>Variable name.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Variable value.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:simpleType name="NLogTargetIDList">
+    <xs:restriction base="xs:string">
+      <xs:pattern value="(|([a-zA-Z][a-zA-Z0-9_\-]*))(,([a-zA-Z][a-zA-Z0-9_\-]*))*" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="Target" abstract="true"></xs:complexType>
+  <xs:complexType name="TargetRef">
+    <xs:attribute name="name" type="xs:string" use="required" />
+  </xs:complexType>
+  <xs:complexType name="WrapperTargetBase" abstract="true">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="target" type="Target" minOccurs="1" maxOccurs="1" />
+          <xs:element name="wrapper-target" type="WrapperTargetBase" minOccurs="1" maxOccurs="1" />
+          <xs:element name="compound-target" type="CompoundTargetBase" minOccurs="1" maxOccurs="1" />
+          <xs:element name="target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
+          <xs:element name="wrapper-target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
+          <xs:element name="compound-target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
+        </xs:choice>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="CompoundTargetBase" abstract="true">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="target" type="Target" minOccurs="1" maxOccurs="unbounded" />
+          <xs:element name="wrapper-target" type="WrapperTargetBase" minOccurs="1" maxOccurs="1" />
+          <xs:element name="compound-target" type="CompoundTargetBase" minOccurs="1" maxOccurs="1" />
+          <xs:element name="target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
+          <xs:element name="wrapper-target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
+          <xs:element name="compound-target-ref" type="TargetRef" minOccurs="1" maxOccurs="1" />
+        </xs:choice>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Filter" abstract="true"></xs:complexType>
+  <xs:complexType name="TimeSource" abstract="true"></xs:complexType>
+  <xs:simpleType name="SimpleLayoutAttribute">
+    <xs:restriction base="xs:string">
+      <xs:pattern value=".*" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="Condition">
+    <xs:restriction base="xs:string">
+      <xs:minLength value="1" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="AsyncWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="batchSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="forceLockingQueue" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="fullBatchSizeWriteLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="overflowAction" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.AsyncTargetWrapperOverflowAction" />
+          <xs:element name="queueLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="timeToSleepBetweenBatches" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="batchSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Number of log events that should be processed in a batch by the lazy writer thread.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="forceLockingQueue" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Whether to use the locking queue, instead of a lock-free concurrent queue The locking queue is less concurrent when many logger threads, but reduces memory allocation</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="fullBatchSizeWriteLimit" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Limit of full s to write before yielding into  Performance is better when writing many small batches, than writing a single large batch</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="overflowAction" type="NLog.Targets.Wrappers.AsyncTargetWrapperOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action to be taken when the lazy writer thread request queue count exceeds the set limit.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="queueLimit" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Limit on the number of requests in the lazy writer thread request queue.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="timeToSleepBetweenBatches" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Time in milliseconds to sleep between batches. (1 or less means trigger on new activity)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Targets.Wrappers.AsyncTargetWrapperOverflowAction">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Grow" />
+      <xs:enumeration value="Discard" />
+      <xs:enumeration value="Block" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="AutoFlushWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="asyncFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
+          <xs:element name="flushOnConditionOnly" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="asyncFlush" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Delay the flush until the LogEvent has been confirmed as written</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="condition" type="Condition">
+          <xs:annotation>
+            <xs:documentation>Condition expression. Log events who meet this condition will cause a flush on the wrapped target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="flushOnConditionOnly" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Only flush when LogEvent matches condition. Ignore explicit-flush, config-reload-flush and shutdown-flush</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="BufferingWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="bufferSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="flushTimeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="overflowAction" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.BufferingTargetWrapperOverflowAction" />
+          <xs:element name="slidingTimeout" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="bufferSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Number of log events to be buffered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="flushTimeout" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Timeout (in milliseconds) after which the contents of buffer will be flushed if there's no write in the specified period of time. Use -1 to disable timed flushes.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="overflowAction" type="NLog.Targets.Wrappers.BufferingTargetWrapperOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action to take if the buffer overflows.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="slidingTimeout" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to use sliding timeout.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Targets.Wrappers.BufferingTargetWrapperOverflowAction">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Flush" />
+      <xs:enumeration value="Discard" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="Chainsaw">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
+          <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="sslProtocols" minOccurs="0" maxOccurs="1" type="System.Security.Authentication.SslProtocols" />
+          <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="keepAliveTimeSeconds" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
+          <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="ndlcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
+          <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeScopeProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="loggerName" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="encoding" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Encoding to be used.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Instance of  that is used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="lineEnding" type="LineEndingMode">
+          <xs:annotation>
+            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxMessageSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum message size in bytes.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="newLine" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="sslProtocols" type="System.Security.Authentication.SslProtocols">
+          <xs:annotation>
+            <xs:documentation>Get or set the SSL/TLS protocols. Default no SSL/TLS is used. Currently only implemented for TCP.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="address" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Network address.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="connectionCacheSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepAliveTimeSeconds" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>The number of seconds a connection will remain idle before the first keep-alive probe is sent</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxQueueSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum queue size.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxConnections" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ndlcItemSeparator" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>NDLC item separator.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ndcItemSeparator" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>NDC item separator.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeScopeProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeSourceInfo" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeNLogData" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeNdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  stack.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeNdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeEventProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeCallSite" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="appInfo" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="loggerName" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Renderer for log4j:event logger-xml-attribute (Default ${logger})</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="System.Security.Authentication.SslProtocols">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="None" />
+      <xs:enumeration value="Ssl2" />
+      <xs:enumeration value="Ssl3" />
+      <xs:enumeration value="Tls" />
+      <xs:enumeration value="Tls11" />
+      <xs:enumeration value="Tls12" />
+      <xs:enumeration value="Tls13" />
+      <xs:enumeration value="Default" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="AllowNewConnnection" />
+      <xs:enumeration value="DiscardMessage" />
+      <xs:enumeration value="Block" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.NetworkTargetOverflowAction">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Error" />
+      <xs:enumeration value="Split" />
+      <xs:enumeration value="Discard" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="NLog.Targets.NLogViewerParameterInfo">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="includeEmptyValue" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+    </xs:choice>
+    <xs:attribute name="layout" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Layout that should be use to calculate the value for the parameter.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Viewer parameter name.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeEmptyValue" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Whether an attribute with empty value should be included in the output</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="ColoredConsole">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="detectConsoleAvailable" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="enableAnsiOutput" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="errorStream" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="autoFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="detectOutputRedirected" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="useDefaultRowHighlightingRules" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="highlight-row" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.ConsoleRowHighlightingRule" />
+          <xs:element name="highlight-word" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.ConsoleWordHighlightingRule" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Text to be rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="header" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Header.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="footer" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Footer.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="detectConsoleAvailable" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to auto-check if the console is available. - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="enableAnsiOutput" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Enables output using ANSI Color Codes</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="encoding" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>The encoding for writing messages to the .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="errorStream" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether the error stream (stderr) should be used instead of the output stream (stdout).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="autoFlush" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to auto-flush after </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="detectOutputRedirected" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to auto-check if the console has been redirected to file - Disables coloring logic when System.Console.IsOutputRedirected = true</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="useDefaultRowHighlightingRules" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to use default row highlighting rules.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Targets.ConsoleOutputColor">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Black" />
+      <xs:enumeration value="DarkBlue" />
+      <xs:enumeration value="DarkGreen" />
+      <xs:enumeration value="DarkCyan" />
+      <xs:enumeration value="DarkRed" />
+      <xs:enumeration value="DarkMagenta" />
+      <xs:enumeration value="DarkYellow" />
+      <xs:enumeration value="Gray" />
+      <xs:enumeration value="DarkGray" />
+      <xs:enumeration value="Blue" />
+      <xs:enumeration value="Green" />
+      <xs:enumeration value="Cyan" />
+      <xs:enumeration value="Red" />
+      <xs:enumeration value="Magenta" />
+      <xs:enumeration value="Yellow" />
+      <xs:enumeration value="White" />
+      <xs:enumeration value="NoChange" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="NLog.Targets.ConsoleRowHighlightingRule">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
+      <xs:element name="backgroundColor" minOccurs="0" maxOccurs="1" type="NLog.Targets.ConsoleOutputColor" />
+      <xs:element name="foregroundColor" minOccurs="0" maxOccurs="1" type="NLog.Targets.ConsoleOutputColor" />
+    </xs:choice>
+    <xs:attribute name="condition" type="Condition">
+      <xs:annotation>
+        <xs:documentation>Condition that must be met in order to set the specified foreground and background color.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backgroundColor" type="NLog.Targets.ConsoleOutputColor">
+      <xs:annotation>
+        <xs:documentation>Background color.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="foregroundColor" type="NLog.Targets.ConsoleOutputColor">
+      <xs:annotation>
+        <xs:documentation>Foreground color.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLog.Targets.ConsoleWordHighlightingRule">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="compileRegex" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
+      <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="regex" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="text" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="wholeWords" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="backgroundColor" minOccurs="0" maxOccurs="1" type="NLog.Targets.ConsoleOutputColor" />
+      <xs:element name="foregroundColor" minOccurs="0" maxOccurs="1" type="NLog.Targets.ConsoleOutputColor" />
+    </xs:choice>
+    <xs:attribute name="compileRegex" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Compile the ? This can improve the performance, but at the costs of more memory usage. If false, the Regex Cache is used.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="condition" type="Condition">
+      <xs:annotation>
+        <xs:documentation>Condition that must be met before scanning the row for highlight of words</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ignoreCase" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to ignore case when comparing texts.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="regex" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Regular expression to be matched. You must specify either text or regex.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Text to be matched. You must specify either text or regex.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="wholeWords" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to match whole words only.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="backgroundColor" type="NLog.Targets.ConsoleOutputColor">
+      <xs:annotation>
+        <xs:documentation>Background color.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="foregroundColor" type="NLog.Targets.ConsoleOutputColor">
+      <xs:annotation>
+        <xs:documentation>Foreground color.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="Console">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="autoFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="detectConsoleAvailable" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="error" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="writeBuffer" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Text to be rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="header" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Header.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="footer" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Footer.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="autoFlush" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to auto-flush after </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="detectConsoleAvailable" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to auto-check if the console is available - Disables console writing if Environment.UserInteractive = False (Windows Service) - Disables console writing if Console Standard Input is not available (Non-Console-App)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="encoding" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>The encoding for writing messages to the .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="error" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to send the log messages to the standard error instead of the standard output.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="writeBuffer" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Whether to enable batch writing using char[]-buffers, instead of using </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Database">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="useTransactions" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="dbProvider" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="dbPassword" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="dbHost" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="dbUserName" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="connectionStringName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="connectionString" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="connectionproperty" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseObjectPropertyInfo" />
+          <xs:element name="commandproperty" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseObjectPropertyInfo" />
+          <xs:element name="dbDatabase" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="installConnectionString" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="install-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
+          <xs:element name="uninstall-command" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseCommandInfo" />
+          <xs:element name="isolationLevel" minOccurs="0" maxOccurs="1" type="System.Data.IsolationLevel" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="commandText" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="commandType" minOccurs="0" maxOccurs="1" type="System.Data.CommandType" />
+          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseParameterInfo" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="useTransactions" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Obsolete - value will be ignored! The logging code always runs outside of transaction. Gets or sets a value indicating whether to use database transactions. Some data providers require this.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep the database connection open between the log events.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbProvider" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the database provider.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbPassword" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Database password. If the ConnectionString is not provided this value will be used to construct the "Password=" part of the connection string.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbHost" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Database host name. If the ConnectionString is not provided this value will be used to construct the "Server=" part of the connection string.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbUserName" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Database user name. If the ConnectionString is not provided this value will be used to construct the "User ID=" part of the connection string.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="connectionStringName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the connection string (as specified in &lt;connectionStrings&gt; configuration section.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="connectionString" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Connection string. When provided, it overrides the values specified in DBHost, DBUserName, DBPassword, DBDatabase.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="dbDatabase" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Database name. If the ConnectionString is not provided this value will be used to construct the "Database=" part of the connection string.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="installConnectionString" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Connection string using for installation and uninstallation. If not provided, regular ConnectionString is being used.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="isolationLevel" type="System.Data.IsolationLevel">
+          <xs:annotation>
+            <xs:documentation>Configures isolated transaction batch writing. If supported by the database, then it will improve insert performance.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="commandText" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Text of the SQL command to be run on each log level.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="commandType" type="System.Data.CommandType">
+          <xs:annotation>
+            <xs:documentation>Type of the SQL command to be run on each log level.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="System.Data.CommandType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Text" />
+      <xs:enumeration value="StoredProcedure" />
+      <xs:enumeration value="TableDirect" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="System.Data.IsolationLevel">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Unspecified" />
+      <xs:enumeration value="Chaos" />
+      <xs:enumeration value="ReadUncommitted" />
+      <xs:enumeration value="ReadCommitted" />
+      <xs:enumeration value="RepeatableRead" />
+      <xs:enumeration value="Serializable" />
+      <xs:enumeration value="Snapshot" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="NLog.Targets.DatabaseObjectPropertyInfo">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="propertyType" minOccurs="0" maxOccurs="1" type="xs:string" />
+    </xs:choice>
+    <xs:attribute name="format" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Convert format of the property value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="culture" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Culture used for parsing property string-value for type-conversion</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="layout" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Value to assign on the object-property</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Name for the object-property</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="propertyType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type of the object-property</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLog.Targets.DatabaseCommandInfo">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="commandType" minOccurs="0" maxOccurs="1" type="System.Data.CommandType" />
+      <xs:element name="connectionString" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="ignoreFailures" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.DatabaseParameterInfo" />
+      <xs:element name="text" minOccurs="0" maxOccurs="1" type="Layout" />
+    </xs:choice>
+    <xs:attribute name="commandType" type="System.Data.CommandType">
+      <xs:annotation>
+        <xs:documentation>Type of the command.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="connectionString" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Connection string to run the command against. If not provided, connection string from the target is used.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="ignoreFailures" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to ignore failures.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="text" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Command text.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLog.Targets.DatabaseParameterInfo">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="dbType" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="size" minOccurs="0" maxOccurs="1" type="xs:integer" />
+      <xs:element name="precision" minOccurs="0" maxOccurs="1" type="xs:byte" />
+      <xs:element name="scale" minOccurs="0" maxOccurs="1" type="xs:byte" />
+      <xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="allowDbNull" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="format" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="culture" minOccurs="0" maxOccurs="1" type="xs:string" />
+    </xs:choice>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Database parameter name.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="layout" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Layout that should be use to calculate the value for the parameter.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="dbType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Database parameter DbType.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="size" type="xs:integer">
+      <xs:annotation>
+        <xs:documentation>Database parameter size.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="precision" type="xs:byte">
+      <xs:annotation>
+        <xs:documentation>Database parameter precision.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="scale" type="xs:byte">
+      <xs:annotation>
+        <xs:documentation>Database parameter scale.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="parameterType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type of the parameter.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="allowDbNull" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Whether empty value should translate into DbNull. Requires database column to allow NULL values.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="format" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Convert format of the database parameter value.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="culture" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Culture used for parsing parameter string-value for type-conversion</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="Debugger">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Text to be rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="header" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Header.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="footer" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Footer.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Debug">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="EventLog">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="category" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="entryType" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="eventId" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="log" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="machineName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="maxKilobytes" minOccurs="0" maxOccurs="1" type="xs:long" />
+          <xs:element name="maxMessageLength" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="source" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.EventLogTargetOverflowAction" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="category" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout that renders event Category.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="entryType" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Optional entry type. When not set, or when not convertible to  then determined by </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="eventId" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout that renders event ID.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="log" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the Event Log to write to. This can be System, Application or any user-defined name.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="machineName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the machine on which Event Log service is running.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxKilobytes" type="xs:long">
+          <xs:annotation>
+            <xs:documentation>Maximum Event log size in kilobytes.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxMessageLength" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Message length limit to write to the Event Log.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="source" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Value to be used as the event Source.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="onOverflow" type="NLog.Targets.EventLogTargetOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action to take if the message is larger than the  option.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Targets.EventLogTargetOverflowAction">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Truncate" />
+      <xs:enumeration value="Split" />
+      <xs:enumeration value="Discard" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="FallbackGroup">
+    <xs:complexContent>
+      <xs:extension base="CompoundTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="returnToFirstOnSuccess" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="returnToFirstOnSuccess" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to return to the first target after any successful write.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="File">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
+          <xs:element name="maxArchiveDays" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="enableArchiveFileCompression" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="archiveNumbering" minOccurs="0" maxOccurs="1" type="NLog.Targets.ArchiveNumberingMode" />
+          <xs:element name="archiveFileName" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="archiveFileKind" minOccurs="0" maxOccurs="1" type="NLog.Targets.FilePathKind" />
+          <xs:element name="archiveEvery" minOccurs="0" maxOccurs="1" type="NLog.Targets.FileArchivePeriod" />
+          <xs:element name="archiveAboveSize" minOccurs="0" maxOccurs="1" type="xs:long" />
+          <xs:element name="maxArchiveFiles" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="writeFooterOnArchivingOnly" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="maxLogFilenames" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="deleteOldFileOnStartup" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="fileAttributes" minOccurs="0" maxOccurs="1" type="NLog.Targets.Win32FileAttributes" />
+          <xs:element name="createDirs" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="cleanupFileName" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="archiveOldFileOnStartupAboveSize" minOccurs="0" maxOccurs="1" type="xs:long" />
+          <xs:element name="archiveOldFileOnStartup" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="archiveDateFormat" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="enableFileDelete" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="writeBom" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="replaceFileContentsOnEachWrite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="forceMutexConcurrentWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="forceManaged" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="fileNameKind" minOccurs="0" maxOccurs="1" type="NLog.Targets.FilePathKind" />
+          <xs:element name="fileName" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="networkWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="openFileCacheTimeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="openFileCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="keepFileOpen" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="discardAll" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="concurrentWrites" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="concurrentWriteAttempts" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="concurrentWriteAttemptDelay" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="bufferSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="openFileFlushTimeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="autoFlush" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Text to be rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="header" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Header.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="footer" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Footer.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="encoding" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>File encoding.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="lineEnding" type="LineEndingMode">
+          <xs:annotation>
+            <xs:documentation>Line ending mode.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxArchiveDays" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum days of archive files that should be kept.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="enableArchiveFileCompression" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to compress archive files into the zip archive format.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveNumbering" type="NLog.Targets.ArchiveNumberingMode">
+          <xs:annotation>
+            <xs:documentation>Way file archives are numbered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveFileName" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Name of the file to be used for an archive.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveFileKind" type="NLog.Targets.FilePathKind">
+          <xs:annotation>
+            <xs:documentation>Is the  an absolute or relative path?</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveEvery" type="NLog.Targets.FileArchivePeriod">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to automatically archive log files every time the specified time passes.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveAboveSize" type="xs:long">
+          <xs:annotation>
+            <xs:documentation>Size in bytes above which log files will be automatically archived. Warning: combining this with  isn't supported. We cannot create multiple archive files, if they should have the same name. Choose: </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxArchiveFiles" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum number of archive files that should be kept.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="writeFooterOnArchivingOnly" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether the footer should be written only when the file is archived.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxLogFilenames" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum number of log file names that should be stored as existing.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="deleteOldFileOnStartup" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to delete old log file on startup.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="fileAttributes" type="NLog.Targets.Win32FileAttributes">
+          <xs:annotation>
+            <xs:documentation>File attributes (Windows only).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="createDirs" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to create directories if they do not exist.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="cleanupFileName" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Cleanup invalid values in a filename, e.g. slashes in a filename. If set to true, this can impact the performance of massive writes. If set to false, nothing gets written when the filename is wrong.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveOldFileOnStartupAboveSize" type="xs:long">
+          <xs:annotation>
+            <xs:documentation>Value of the file size threshold to archive old log file on startup.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveOldFileOnStartup" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to archive old log file on startup.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="archiveDateFormat" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Value specifying the date format to use when archiving files.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="enableFileDelete" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to enable log file(s) to be deleted.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="writeBom" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to write BOM (byte order mark) in created files</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="replaceFileContentsOnEachWrite" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to replace file contents on each write instead of appending log message at the end.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="forceMutexConcurrentWrites" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether file creation calls should be synchronized by a system global mutex.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="forceManaged" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Gets or set a value indicating whether a managed file stream is forced, instead of using the native implementation.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="fileNameKind" type="NLog.Targets.FilePathKind">
+          <xs:annotation>
+            <xs:documentation>Is the  an absolute or relative path?</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="fileName" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Name of the file to write to.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="networkWrites" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether concurrent writes to the log file by multiple processes on different network hosts.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="openFileCacheTimeout" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum number of seconds that files are kept open. If this number is negative the files are not automatically closed after a period of inactivity.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="openFileCacheSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Number of files to be kept open. Setting this to a higher value may improve performance in a situation where a single File target is writing to many files (such as splitting by level or by logger).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepFileOpen" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep log file open instead of opening and closing it on each logging event.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="discardAll" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Whether or not this target should just discard all data that its asked to write. Mostly used for when testing NLog Stack except final write</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="concurrentWrites" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether concurrent writes to the log file by multiple processes on the same host.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="concurrentWriteAttempts" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Number of times the write is appended on the file before NLog discards the log message.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="concurrentWriteAttemptDelay" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Delay in milliseconds to wait before attempting to write to the file again.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="bufferSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Log file buffer size in bytes.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="openFileFlushTimeout" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum number of seconds before open files are flushed. If this number is negative or zero the files are not flushed by timer.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="autoFlush" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to automatically flush the file buffers after each log message.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Targets.ArchiveNumberingMode">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Sequence" />
+      <xs:enumeration value="Rolling" />
+      <xs:enumeration value="Date" />
+      <xs:enumeration value="DateAndSequence" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.FilePathKind">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Unknown" />
+      <xs:enumeration value="Relative" />
+      <xs:enumeration value="Absolute" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.FileArchivePeriod">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="None" />
+      <xs:enumeration value="Year" />
+      <xs:enumeration value="Month" />
+      <xs:enumeration value="Day" />
+      <xs:enumeration value="Hour" />
+      <xs:enumeration value="Minute" />
+      <xs:enumeration value="Sunday" />
+      <xs:enumeration value="Monday" />
+      <xs:enumeration value="Tuesday" />
+      <xs:enumeration value="Wednesday" />
+      <xs:enumeration value="Thursday" />
+      <xs:enumeration value="Friday" />
+      <xs:enumeration value="Saturday" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.Win32FileAttributes">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="ReadOnly" />
+      <xs:enumeration value="Hidden" />
+      <xs:enumeration value="System" />
+      <xs:enumeration value="Archive" />
+      <xs:enumeration value="Device" />
+      <xs:enumeration value="Normal" />
+      <xs:enumeration value="Temporary" />
+      <xs:enumeration value="SparseFile" />
+      <xs:enumeration value="ReparsePoint" />
+      <xs:enumeration value="Compressed" />
+      <xs:enumeration value="NotContentIndexed" />
+      <xs:enumeration value="Encrypted" />
+      <xs:enumeration value="WriteThrough" />
+      <xs:enumeration value="NoBuffering" />
+      <xs:enumeration value="DeleteOnClose" />
+      <xs:enumeration value="PosixSemantics" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="FilteringWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
+          <xs:element name="filter" minOccurs="0" maxOccurs="1" type="Filter" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="condition" type="Condition">
+          <xs:annotation>
+            <xs:documentation>Condition expression. Log events who meet this condition will be forwarded to the wrapped target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="ImpersonatingWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="domain" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="impersonationLevel" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.SecurityImpersonationLevel" />
+          <xs:element name="logOnProvider" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.LogOnProviderType" />
+          <xs:element name="logOnType" minOccurs="0" maxOccurs="1" type="NLog.Targets.Wrappers.SecurityLogOnType" />
+          <xs:element name="password" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="revertToSelf" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="userName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="domain" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Windows domain name to change context to.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="impersonationLevel" type="NLog.Targets.Wrappers.SecurityImpersonationLevel">
+          <xs:annotation>
+            <xs:documentation>Required impersonation level.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="logOnProvider" type="NLog.Targets.Wrappers.LogOnProviderType">
+          <xs:annotation>
+            <xs:documentation>Type of the logon provider.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="logOnType" type="NLog.Targets.Wrappers.SecurityLogOnType">
+          <xs:annotation>
+            <xs:documentation>Logon Type.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="password" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>User account password.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="revertToSelf" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to revert to the credentials of the process instead of impersonating another user.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="userName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Username to change context to.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Targets.Wrappers.SecurityImpersonationLevel">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Anonymous" />
+      <xs:enumeration value="Identification" />
+      <xs:enumeration value="Impersonation" />
+      <xs:enumeration value="Delegation" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.Wrappers.LogOnProviderType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Default" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.Wrappers.SecurityLogOnType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Interactive" />
+      <xs:enumeration value="Network" />
+      <xs:enumeration value="Batch" />
+      <xs:enumeration value="Service" />
+      <xs:enumeration value="NetworkClearText" />
+      <xs:enumeration value="NewCredentials" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="LimitingWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="interval" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="messageLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="interval" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Interval in which messages will be written up to the  number of messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="messageLimit" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum allowed number of messages written per .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="LogReceiverService">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="endpointAddress" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="endpointConfigurationName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="useOneWayContract" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="clientId" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
+          <xs:element name="useBinaryEncoding" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="endpointAddress" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Endpoint address.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="endpointConfigurationName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the endpoint configuration in WCF configuration file.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="useOneWayContract" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to use a WCF service contract that is one way (fire and forget) or two way (request-reply)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="clientId" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Client ID.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeEventProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include per-event properties in the payload sent to the server.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="useBinaryEncoding" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to use binary message encoding.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="NLog.Targets.MethodCallParameter">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="parameterType" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="type" minOccurs="0" maxOccurs="1" type="xs:string" />
+    </xs:choice>
+    <xs:attribute name="layout" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Layout that should be use to calculate the value for the parameter.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Name of the parameter.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="parameterType" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type of the parameter.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="type" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Type of the parameter. Obsolete alias for </xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="Mail">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="replaceNewlineWithBrTagInHtml" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="priority" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="bcc" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="cc" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="addNewLines" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="html" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="from" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="body" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="subject" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="to" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="timeout" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="smtpServer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="smtpAuthentication" minOccurs="0" maxOccurs="1" type="NLog.Targets.SmtpAuthenticationMode" />
+          <xs:element name="smtpUserName" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="smtpPassword" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="enableSsl" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="smtpPort" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="useSystemNetMailSettings" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="pickupDirectoryLocation" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="deliveryMethod" minOccurs="0" maxOccurs="1" type="System.Net.Mail.SmtpDeliveryMethod" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Text to be rendered.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="header" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Header.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="footer" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Footer.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="replaceNewlineWithBrTagInHtml" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether NewLine characters in the body should be replaced with  tags.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="priority" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Priority used for sending mails.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="encoding" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Encoding to be used for sending e-mail.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="bcc" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>BCC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="cc" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>CC email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="addNewLines" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to add new lines between log entries.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="html" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to send message as HTML instead of plain text.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="from" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Sender's email address (e.g. joe@domain.com).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="body" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Mail message body (repeated for each log message send in one mail).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="subject" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Mail subject.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="to" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Recipients' email addresses separated by semicolons (e.g. john@domain.com;jane@domain.com).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="timeout" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Indicates the SMTP client timeout.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="smtpServer" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>SMTP Server to be used for sending.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="smtpAuthentication" type="NLog.Targets.SmtpAuthenticationMode">
+          <xs:annotation>
+            <xs:documentation>SMTP Authentication mode.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="smtpUserName" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Username used to connect to SMTP server (used when SmtpAuthentication is set to "basic").</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="smtpPassword" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Password used to authenticate against SMTP server (used when SmtpAuthentication is set to "basic").</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="enableSsl" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether SSL (secure sockets layer) should be used when communicating with SMTP server.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="smtpPort" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Port number that SMTP Server is listening on.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="useSystemNetMailSettings" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether the default Settings from System.Net.MailSettings should be used.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="pickupDirectoryLocation" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Folder where applications save mail messages to be processed by the local SMTP server.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="deliveryMethod" type="System.Net.Mail.SmtpDeliveryMethod">
+          <xs:annotation>
+            <xs:documentation>Specifies how outgoing email messages will be handled.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Targets.SmtpAuthenticationMode">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="None" />
+      <xs:enumeration value="Basic" />
+      <xs:enumeration value="Ntlm" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="System.Net.Mail.SmtpDeliveryMethod">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Network" />
+      <xs:enumeration value="SpecifiedPickupDirectory" />
+      <xs:enumeration value="PickupDirectoryFromIis" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="Memory">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="maxLogsCount" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxLogsCount" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Max number of items to have in memory</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="MethodCall">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="className" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="methodName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="className" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Class name.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="methodName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Method name. The method must be public and static. Use the AssemblyQualifiedName , https://msdn.microsoft.com/en-us/library/system.type.assemblyqualifiedname(v=vs.110).aspx e.g.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Network">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
+          <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="keepAliveTimeSeconds" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
+          <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="sslProtocols" minOccurs="0" maxOccurs="1" type="System.Security.Authentication.SslProtocols" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="encoding" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Encoding to be used.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="lineEnding" type="LineEndingMode">
+          <xs:annotation>
+            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxMessageSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum message size in bytes.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="newLine" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="address" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Network address.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="connectionCacheSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepAliveTimeSeconds" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>The number of seconds a connection will remain idle before the first keep-alive probe is sent</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxConnections" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxQueueSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum queue size.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="sslProtocols" type="System.Security.Authentication.SslProtocols">
+          <xs:annotation>
+            <xs:documentation>Get or set the SSL/TLS protocols. Default no SSL/TLS is used. Currently only implemented for TCP.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="NLogViewer">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="lineEnding" minOccurs="0" maxOccurs="1" type="LineEndingMode" />
+          <xs:element name="maxMessageSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="newLine" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="sslProtocols" minOccurs="0" maxOccurs="1" type="System.Security.Authentication.SslProtocols" />
+          <xs:element name="address" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="connectionCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="keepAliveTimeSeconds" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxQueueSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxConnections" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="onConnectionOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetConnectionsOverflowAction" />
+          <xs:element name="onOverflow" minOccurs="0" maxOccurs="1" type="NLog.Targets.NetworkTargetOverflowAction" />
+          <xs:element name="keepConnection" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="ndlcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
+          <xs:element name="ndcItemSeparator" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeScopeProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNLogData" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="appInfo" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="loggerName" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="encoding" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Encoding to be used.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Instance of  that is used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="lineEnding" type="LineEndingMode">
+          <xs:annotation>
+            <xs:documentation>End of line value if a newline is appended at the end of log message .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxMessageSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum message size in bytes.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="newLine" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to append newline at the end of log message.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="sslProtocols" type="System.Security.Authentication.SslProtocols">
+          <xs:annotation>
+            <xs:documentation>Get or set the SSL/TLS protocols. Default no SSL/TLS is used. Currently only implemented for TCP.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="address" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Network address.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="connectionCacheSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Size of the connection cache (number of connections which are kept alive).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepAliveTimeSeconds" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>The number of seconds a connection will remain idle before the first keep-alive probe is sent</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxQueueSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum queue size.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxConnections" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Maximum current connections. 0 = no maximum.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="onConnectionOverflow" type="NLog.Targets.NetworkTargetConnectionsOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the will be more connections than .</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="onOverflow" type="NLog.Targets.NetworkTargetOverflowAction">
+          <xs:annotation>
+            <xs:documentation>Action that should be taken if the message is larger than maxMessageSize.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="keepConnection" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to keep connection open whenever possible.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ndlcItemSeparator" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>NDLC item separator.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ndcItemSeparator" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>NDC item separator.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeScopeProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeSourceInfo" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeNLogData" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include NLog-specific extensions to log4j schema.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeNdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  stack.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeNdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  stack contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include  dictionary contents.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeEventProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeCallSite" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="appInfo" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>AppInfo field. By default it's the friendly name of the current AppDomain.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="loggerName" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Renderer for log4j:event logger-xml-attribute (Default ${logger})</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Null">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="formatMessage" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="formatMessage" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to perform layout calculation.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="OutputDebugString">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="PerfCounter">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="autoCreate" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="categoryName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="counterHelp" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="counterName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="counterType" minOccurs="0" maxOccurs="1" type="System.Diagnostics.PerformanceCounterType" />
+          <xs:element name="incrementValue" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="instanceName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="autoCreate" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether performance counter should be automatically created.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="categoryName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the performance counter category.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="counterHelp" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Counter help text.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="counterName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the performance counter.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="counterType" type="System.Diagnostics.PerformanceCounterType">
+          <xs:annotation>
+            <xs:documentation>Performance counter type.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="incrementValue" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>The value by which to increment the counter.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="instanceName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Performance counter instance name.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="System.Diagnostics.PerformanceCounterType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="NumberOfItems32" />
+      <xs:enumeration value="NumberOfItems64" />
+      <xs:enumeration value="NumberOfItemsHEX32" />
+      <xs:enumeration value="NumberOfItemsHEX64" />
+      <xs:enumeration value="RateOfCountsPerSecond32" />
+      <xs:enumeration value="RateOfCountsPerSecond64" />
+      <xs:enumeration value="CountPerTimeInterval32" />
+      <xs:enumeration value="CountPerTimeInterval64" />
+      <xs:enumeration value="RawFraction" />
+      <xs:enumeration value="RawBase" />
+      <xs:enumeration value="AverageTimer32" />
+      <xs:enumeration value="AverageBase" />
+      <xs:enumeration value="AverageCount64" />
+      <xs:enumeration value="SampleFraction" />
+      <xs:enumeration value="SampleCounter" />
+      <xs:enumeration value="SampleBase" />
+      <xs:enumeration value="CounterTimer" />
+      <xs:enumeration value="CounterTimerInverse" />
+      <xs:enumeration value="Timer100Ns" />
+      <xs:enumeration value="Timer100NsInverse" />
+      <xs:enumeration value="ElapsedTime" />
+      <xs:enumeration value="CounterMultiTimer" />
+      <xs:enumeration value="CounterMultiTimerInverse" />
+      <xs:enumeration value="CounterMultiTimer100Ns" />
+      <xs:enumeration value="CounterMultiTimer100NsInverse" />
+      <xs:enumeration value="CounterMultiBase" />
+      <xs:enumeration value="CounterDelta32" />
+      <xs:enumeration value="CounterDelta64" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="PostFilteringWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="defaultFilter" minOccurs="0" maxOccurs="1" type="Condition" />
+          <xs:element name="when" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.Wrappers.FilteringRule" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="defaultFilter" type="Condition">
+          <xs:annotation>
+            <xs:documentation>Default filter to be applied when no specific rule matches.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="NLog.Targets.Wrappers.FilteringRule">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="exists" minOccurs="0" maxOccurs="1" type="Condition" />
+      <xs:element name="filter" minOccurs="0" maxOccurs="1" type="Condition" />
+    </xs:choice>
+    <xs:attribute name="exists" type="Condition">
+      <xs:annotation>
+        <xs:documentation>Condition to be tested.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="filter" type="Condition">
+      <xs:annotation>
+        <xs:documentation>Resulting filter to be applied when the condition matches.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="RandomizeGroup">
+    <xs:complexContent>
+      <xs:extension base="CompoundTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="RepeatingWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="repeatCount" minOccurs="0" maxOccurs="1" type="xs:integer" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="repeatCount" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Number of times to repeat each log message.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="RetryingWrapper">
+    <xs:complexContent>
+      <xs:extension base="WrapperTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="retryCount" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="retryDelayMilliseconds" minOccurs="0" maxOccurs="1" type="xs:integer" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="retryCount" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Number of retries that should be attempted on the wrapped target in case of a failure.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="retryDelayMilliseconds" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Time to wait between retries in milliseconds.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="RoundRobinGroup">
+    <xs:complexContent>
+      <xs:extension base="CompoundTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="SplitGroup">
+    <xs:complexContent>
+      <xs:extension base="CompoundTargetBase">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Trace">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="enableTraceFail" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="rawWrite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout used to format log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="enableTraceFail" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Forward  to  (Instead of )</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="rawWrite" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Always use  independent of </xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="WebService">
+    <xs:complexContent>
+      <xs:extension base="Target">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeBOM" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="methodName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="namespace" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="protocol" minOccurs="0" maxOccurs="1" type="NLog.Targets.WebServiceProtocol" />
+          <xs:element name="proxyAddress" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="encoding" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="url" minOccurs="0" maxOccurs="1" type="xs:anyURI" />
+          <xs:element name="userAgent" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="escapeDataNLogLegacy" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="escapeDataRfc3986" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="preAuthenticate" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="xmlRoot" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="xmlRootNamespace" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="header" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.MethodCallParameter" />
+          <xs:element name="proxyType" minOccurs="0" maxOccurs="1" type="NLog.Targets.WebServiceProxyType" />
+        </xs:choice>
+        <xs:attribute name="name" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the target.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Target supports reuse of internal buffers, and doesn't have to constantly allocate new buffers Required for legacy NLog-targets, that expects buffers to remain stable after Write-method exit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeBOM" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Should we include the BOM (Byte-order-mark) for UTF? Influences the  property. This will only work for UTF-8.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="methodName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Web service method name. Only used with Soap.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="namespace" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Web service namespace. Only used with Soap.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="protocol" type="NLog.Targets.WebServiceProtocol">
+          <xs:annotation>
+            <xs:documentation>Protocol to be used when calling web service.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="proxyAddress" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Custom proxy address, include port separated by a colon</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="encoding" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Encoding.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="url" type="xs:anyURI">
+          <xs:annotation>
+            <xs:documentation>Web service URL.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="userAgent" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Value of the User-agent HTTP header.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="escapeDataNLogLegacy" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Value whether escaping be done according to the old NLog style (Very non-standard)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="escapeDataRfc3986" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Value whether escaping be done according to Rfc3986 (Supports Internationalized Resource Identifiers - IRIs)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="preAuthenticate" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to pre-authenticate the HttpWebRequest (Requires 'Authorization' in  parameters)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="xmlRoot" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the root XML element, if POST of XML document chosen. If so, this property must not be null. (see  and ).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="xmlRootNamespace" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>(optional) root namespace of the XML document, if POST of XML document chosen. (see  and ).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="proxyType" type="NLog.Targets.WebServiceProxyType">
+          <xs:annotation>
+            <xs:documentation>Proxy configuration when calling web service</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Targets.WebServiceProtocol">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Soap11" />
+      <xs:enumeration value="Soap12" />
+      <xs:enumeration value="HttpPost" />
+      <xs:enumeration value="HttpGet" />
+      <xs:enumeration value="JsonPost" />
+      <xs:enumeration value="XmlPost" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Targets.WebServiceProxyType">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="DefaultWebProxy" />
+      <xs:enumeration value="AutoProxy" />
+      <xs:enumeration value="NoProxy" />
+      <xs:enumeration value="ProxyAddress" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="CompoundLayout">
+    <xs:complexContent>
+      <xs:extension base="Layout">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="layout" minOccurs="0" maxOccurs="unbounded" type="Layout" />
+        </xs:choice>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Layout">
+    <xs:choice minOccurs="0" maxOccurs="unbounded" />
+  </xs:complexType>
+  <xs:complexType name="CsvLayout">
+    <xs:complexContent>
+      <xs:extension base="Layout">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="column" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.CsvColumn" />
+          <xs:element name="customColumnDelimiter" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="delimiter" minOccurs="0" maxOccurs="1" type="NLog.Layouts.CsvColumnDelimiterMode" />
+          <xs:element name="quoteChar" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="quoting" minOccurs="0" maxOccurs="1" type="NLog.Layouts.CsvQuotingMode" />
+          <xs:element name="withHeader" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+        </xs:choice>
+        <xs:attribute name="footer" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Footer layout.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="header" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Header layout.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Body layout (can be repeated multiple times).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="customColumnDelimiter" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Custom column delimiter value (valid when ColumnDelimiter is set to 'Custom').</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="delimiter" type="NLog.Layouts.CsvColumnDelimiterMode">
+          <xs:annotation>
+            <xs:documentation>Column delimiter.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="quoteChar" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Quote Character.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="quoting" type="NLog.Layouts.CsvQuotingMode">
+          <xs:annotation>
+            <xs:documentation>Quoting mode.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="withHeader" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether CVS should include header.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="NLog.Layouts.CsvQuotingMode">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="All" />
+      <xs:enumeration value="Nothing" />
+      <xs:enumeration value="Auto" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:simpleType name="NLog.Layouts.CsvColumnDelimiterMode">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Auto" />
+      <xs:enumeration value="Comma" />
+      <xs:enumeration value="Semicolon" />
+      <xs:enumeration value="Tab" />
+      <xs:enumeration value="Pipe" />
+      <xs:enumeration value="Space" />
+      <xs:enumeration value="Custom" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="NLog.Layouts.CsvColumn">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="quoting" minOccurs="0" maxOccurs="1" type="NLog.Layouts.CsvQuotingMode" />
+    </xs:choice>
+    <xs:attribute name="layout" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Layout of the column.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Name of the column.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="quoting" type="NLog.Layouts.CsvQuotingMode">
+      <xs:annotation>
+        <xs:documentation>Override of Quoting mode</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="JsonLayout">
+    <xs:complexContent>
+      <xs:extension base="Layout">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="escapeForwardSlash" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="renderEmptyObject" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="suppressSpaces" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.JsonAttribute" />
+          <xs:element name="excludeEmptyProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeGdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeScopeProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="maxRecursionLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
+        </xs:choice>
+        <xs:attribute name="escapeForwardSlash" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Should forward slashes be escaped? If true, / will be converted to \/</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="renderEmptyObject" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to render the empty object value {}</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="suppressSpaces" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to suppress the extra spaces in the output json</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="excludeEmptyProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to exclude null/empty properties from the log event (as JSON)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="excludeProperties" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>List of property names to exclude when  is true</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log event (as JSON)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeEventProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log event (as JSON)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeGdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeScopeProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxRecursionLimit" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>How far should the JSON serializer follow object references before backing off</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="NLog.Layouts.JsonAttribute">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="encode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="escapeForwardSlash" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="escapeUnicode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="includeEmptyValue" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+    </xs:choice>
+    <xs:attribute name="layout" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Layout that will be rendered as the attribute's value.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Name of the attribute.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="encode" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Determines whether or not this attribute will be Json encoded.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="escapeForwardSlash" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Should forward slashes be escaped? If true, / will be converted to \/</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="escapeUnicode" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to escape non-ascii characters</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeEmptyValue" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Whether an attribute with empty value should be included in the output</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="LayoutWithHeaderAndFooter">
+    <xs:complexContent>
+      <xs:extension base="Layout">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="footer" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="header" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+        </xs:choice>
+        <xs:attribute name="footer" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Footer layout.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="header" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Header layout.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Body layout (can be repeated multiple times).</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="Log4JXmlEventLayout">
+    <xs:complexContent>
+      <xs:extension base="Layout">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeCallSite" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeNdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeScopeProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeSourceInfo" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="parameter" minOccurs="0" maxOccurs="unbounded" type="NLog.Targets.NLogViewerParameterInfo" />
+        </xs:choice>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeCallSite" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include call site (class and method name) in the information sent over the network.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeEventProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log events</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeNdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  stack.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeNdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  stack.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeScopeProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeSourceInfo" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include source info (file name and line number) in the information sent over the network.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="SimpleLayout">
+    <xs:complexContent>
+      <xs:extension base="Layout">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="text" minOccurs="0" maxOccurs="1" type="xs:string" />
+        </xs:choice>
+        <xs:attribute name="text" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Layout text.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="XmlLayout">
+    <xs:complexContent>
+      <xs:extension base="Layout">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="propertiesElementKeyAttribute" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="propertiesCollectionItemName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="maxRecursionLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="includeScopeProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="propertiesElementValueAttribute" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="propertiesElementName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="elementEncode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="indentXml" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="includeEmptyValue" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="elementValue" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="element" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.XmlElement" />
+          <xs:element name="elementName" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.XmlAttribute" />
+        </xs:choice>
+        <xs:attribute name="includeAllProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log event (as XML)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="propertiesElementKeyAttribute" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>XML attribute name to use when rendering property-key When null (or empty) then key-attribute is not included</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="propertiesCollectionItemName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>XML element name to use for rendering IList-collections items</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxRecursionLimit" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>How far should the XML serializer follow object references before backing off</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeScopeProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdlc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeMdc" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeEventProperties" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Option to include all properties from the log event (as XML)</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="propertiesElementValueAttribute" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>XML attribute name to use when rendering property-value When null (or empty) then value-attribute is not included and value is formatted as XML-element-value</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="excludeProperties" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>List of property names to exclude when  is true</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="propertiesElementName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>XML element name to use when rendering properties</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="elementEncode" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Determines whether or not this attribute will be Xml encoded.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="indentXml" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Auto indent and create new lines</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeEmptyValue" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Whether a ElementValue with empty value should be included in the output</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="elementValue" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Value inside the root XML element</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="elementName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Name of the root XML element</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="NLog.Layouts.XmlElement">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="encode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="value" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="attribute" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.XmlAttribute" />
+      <xs:element name="element" minOccurs="0" maxOccurs="unbounded" type="NLog.Layouts.XmlElement" />
+      <xs:element name="includeEmptyValue" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="indentXml" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="excludeProperties" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="includeAllProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="includeEventProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="includeMdc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="includeMdlc" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="includeScopeProperties" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="maxRecursionLimit" minOccurs="0" maxOccurs="1" type="xs:integer" />
+      <xs:element name="propertiesCollectionItemName" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="propertiesElementKeyAttribute" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="propertiesElementName" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="propertiesElementValueAttribute" minOccurs="0" maxOccurs="1" type="xs:string" />
+    </xs:choice>
+    <xs:attribute name="encode" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Determines whether or not this attribute will be Xml encoded.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Name of the element</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="value" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Value inside the element</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeEmptyValue" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Whether a ElementValue with empty value should be included in the output</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="indentXml" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Auto indent and create new lines</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="excludeProperties" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>List of property names to exclude when  is true</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeAllProperties" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Option to include all properties from the log event (as XML)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeEventProperties" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Option to include all properties from the log event (as XML)</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeMdc" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeMdlc" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeScopeProperties" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Indicates whether to include contents of the  dictionary.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="maxRecursionLimit" type="xs:integer">
+      <xs:annotation>
+        <xs:documentation>How far should the XML serializer follow object references before backing off</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="propertiesCollectionItemName" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>XML element name to use for rendering IList-collections items</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="propertiesElementKeyAttribute" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>XML attribute name to use when rendering property-key When null (or empty) then key-attribute is not included</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="propertiesElementName" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>XML element name to use when rendering properties</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="propertiesElementValueAttribute" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>XML attribute name to use when rendering property-value When null (or empty) then value-attribute is not included and value is formatted as XML-element-value</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="NLog.Layouts.XmlAttribute">
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+      <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+      <xs:element name="name" minOccurs="0" maxOccurs="1" type="xs:string" />
+      <xs:element name="encode" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+      <xs:element name="includeEmptyValue" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+    </xs:choice>
+    <xs:attribute name="layout" type="SimpleLayoutAttribute">
+      <xs:annotation>
+        <xs:documentation>Layout that will be rendered as the attribute's value.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="name" type="xs:string">
+      <xs:annotation>
+        <xs:documentation>Name of the attribute.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="encode" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Determines whether or not this attribute will be Xml encoded.</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+    <xs:attribute name="includeEmptyValue" type="xs:boolean">
+      <xs:annotation>
+        <xs:documentation>Whether an attribute with empty value should be included in the output</xs:documentation>
+      </xs:annotation>
+    </xs:attribute>
+  </xs:complexType>
+  <xs:complexType name="when">
+    <xs:complexContent>
+      <xs:extension base="Filter">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
+          <xs:element name="condition" minOccurs="0" maxOccurs="1" type="Condition" />
+        </xs:choice>
+        <xs:attribute name="action" type="FilterResult">
+          <xs:annotation>
+            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="condition" type="Condition">
+          <xs:annotation>
+            <xs:documentation>Condition expression.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:simpleType name="FilterResult">
+    <xs:restriction base="xs:string">
+      <xs:enumeration value="Neutral" />
+      <xs:enumeration value="Log" />
+      <xs:enumeration value="Ignore" />
+      <xs:enumeration value="LogFinal" />
+      <xs:enumeration value="IgnoreFinal" />
+    </xs:restriction>
+  </xs:simpleType>
+  <xs:complexType name="whenContains">
+    <xs:complexContent>
+      <xs:extension base="Filter">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
+          <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="substring" minOccurs="0" maxOccurs="1" type="xs:string" />
+        </xs:choice>
+        <xs:attribute name="action" type="FilterResult">
+          <xs:annotation>
+            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ignoreCase" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to ignore case when comparing strings.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="substring" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Substring to be matched.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="whenEqual">
+    <xs:complexContent>
+      <xs:extension base="Filter">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
+          <xs:element name="compareTo" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+        </xs:choice>
+        <xs:attribute name="action" type="FilterResult">
+          <xs:annotation>
+            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="compareTo" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>String to compare the layout to.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ignoreCase" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to ignore case when comparing strings.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="whenNotContains">
+    <xs:complexContent>
+      <xs:extension base="Filter">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
+          <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="substring" minOccurs="0" maxOccurs="1" type="xs:string" />
+        </xs:choice>
+        <xs:attribute name="action" type="FilterResult">
+          <xs:annotation>
+            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ignoreCase" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to ignore case when comparing strings.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="substring" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Substring to be matched.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="whenNotEqual">
+    <xs:complexContent>
+      <xs:extension base="Filter">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
+          <xs:element name="compareTo" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="ignoreCase" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+        </xs:choice>
+        <xs:attribute name="action" type="FilterResult">
+          <xs:annotation>
+            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="compareTo" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>String to compare the layout to.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="ignoreCase" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Indicates whether to ignore case when comparing strings.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="whenRepeated">
+    <xs:complexContent>
+      <xs:extension base="Filter">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+          <xs:element name="action" minOccurs="0" maxOccurs="1" type="FilterResult" />
+          <xs:element name="defaultFilterCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="includeFirst" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="layout" minOccurs="0" maxOccurs="1" type="Layout" />
+          <xs:element name="maxFilterCacheSize" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="maxLength" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="timeoutSeconds" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferDefaultLength" minOccurs="0" maxOccurs="1" type="xs:integer" />
+          <xs:element name="optimizeBufferReuse" minOccurs="0" maxOccurs="1" type="xs:boolean" />
+          <xs:element name="filterCountMessageAppendFormat" minOccurs="0" maxOccurs="1" type="xs:string" />
+          <xs:element name="filterCountPropertyName" minOccurs="0" maxOccurs="1" type="xs:string" />
+        </xs:choice>
+        <xs:attribute name="action" type="FilterResult">
+          <xs:annotation>
+            <xs:documentation>Action to be taken when filter matches.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="defaultFilterCacheSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Default number of unique filter values to expect, will automatically increase if needed</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="includeFirst" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Applies the configured action to the initial logevent that starts the timeout period. Used to configure that it should ignore all events until timeout.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="layout" type="SimpleLayoutAttribute">
+          <xs:annotation>
+            <xs:documentation>Layout to be used to filter log messages.</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxFilterCacheSize" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Max number of unique filter values to expect simultaneously</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="maxLength" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Max length of filter values, will truncate if above limit</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="timeoutSeconds" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>How long before a filter expires, and logging is accepted again</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferDefaultLength" type="xs:integer">
+          <xs:annotation>
+            <xs:documentation>Default buffer size for the internal buffers</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="optimizeBufferReuse" type="xs:boolean">
+          <xs:annotation>
+            <xs:documentation>Reuse internal buffers, and doesn't have to constantly allocate new buffers</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="filterCountMessageAppendFormat" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Append FilterCount to the  when an event is no longer filtered</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="filterCountPropertyName" type="xs:string">
+          <xs:annotation>
+            <xs:documentation>Insert FilterCount value into  when an event is no longer filtered</xs:documentation>
+          </xs:annotation>
+        </xs:attribute>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="AccurateLocal">
+    <xs:complexContent>
+      <xs:extension base="TimeSource">
+        <xs:choice minOccurs="0" maxOccurs="unbounded" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="AccurateUTC">
+    <xs:complexContent>
+      <xs:extension base="TimeSource">
+        <xs:choice minOccurs="0" maxOccurs="unbounded" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="FastLocal">
+    <xs:complexContent>
+      <xs:extension base="TimeSource">
+        <xs:choice minOccurs="0" maxOccurs="unbounded" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:complexType name="FastUTC">
+    <xs:complexContent>
+      <xs:extension base="TimeSource">
+        <xs:choice minOccurs="0" maxOccurs="unbounded" />
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+</xs:schema>
\ No newline at end of file
diff --git a/GroupLine.App/Properties/AssemblyInfo.cs b/GroupLine.App/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..1b4eb6f
--- /dev/null
+++ b/GroupLine.App/Properties/AssemblyInfo.cs
@@ -0,0 +1,53 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("GroupLine.App")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HP Inc.")]
+[assembly: AssemblyProduct("GroupLine.App")]
+[assembly: AssemblyCopyright("Copyright © HP Inc. 2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+//若要开始生成可本地化的应用程序，请设置
+//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
+//例如，如果您在源文件中使用的是美国英语，
+//使用的是美国英语，请将 <UICulture> 设置为 en-US。  然后取消
+//对以下 NeutralResourceLanguage 特性的注释。  更新
+//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //主题特定资源词典所处位置
+                                     //(未在页面中找到资源时使用，
+                                     //或应用程序资源字典中找到时使用)
+    ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
+                                              //(未在页面中找到资源时使用，
+                                              //、应用程序或任何主题专用资源字典中找到时使用)
+)]
+
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/GroupLine.App/Properties/Resources.Designer.cs b/GroupLine.App/Properties/Resources.Designer.cs
new file mode 100644
index 0000000..105c3af
--- /dev/null
+++ b/GroupLine.App/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace GroupLine.App.Properties {
+    using System;
+    
+    
+    /// <summary>
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    /// </summary>
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+        
+        private static global::System.Resources.ResourceManager resourceMan;
+        
+        private static global::System.Globalization.CultureInfo resourceCulture;
+        
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+        
+        /// <summary>
+        ///   返回此类使用的缓存的 ResourceManager 实例。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GroupLine.App.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+        
+        /// <summary>
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/GroupLine.App/Properties/Resources.resx b/GroupLine.App/Properties/Resources.resx
new file mode 100644
index 0000000..af7dbeb
--- /dev/null
+++ b/GroupLine.App/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/GroupLine.App/Properties/Settings.Designer.cs b/GroupLine.App/Properties/Settings.Designer.cs
new file mode 100644
index 0000000..15d16af
--- /dev/null
+++ b/GroupLine.App/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
+//
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace GroupLine.App.Properties {
+    
+    
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+        
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+        
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/GroupLine.App/Properties/Settings.settings b/GroupLine.App/Properties/Settings.settings
new file mode 100644
index 0000000..033d7a5
--- /dev/null
+++ b/GroupLine.App/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/GroupLine.App/ReportFile/AppearanceTestTemplate.xlsx b/GroupLine.App/ReportFile/AppearanceTestTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b5976040ff02482f55c473e9fffd0a4b38f7894e
GIT binary patch
literal 10258
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
I=I7o20sLQu#{d8T

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/BurPlugInstallTemplate.xlsx b/GroupLine.App/ReportFile/BurPlugInstallTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b39927088f884a1afa05ce08f86c6a8cd2721898
GIT binary patch
literal 9836
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/CylinderEngravTemplate.xlsx b/GroupLine.App/ReportFile/CylinderEngravTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..f2374face1de31f36370b125aeec2ef604d1f8d1
GIT binary patch
literal 9906
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
MFgN!22_L}!0l~xOEdT%j

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/ExhInstallMesTemplate.xlsx b/GroupLine.App/ReportFile/ExhInstallMesTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..6cd473dd813299e86af63c6c2942ee6e16a9570e
GIT binary patch
literal 10405
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GCDTransplantTemplate.xlsx b/GroupLine.App/ReportFile/GCDTransplantTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..efa2ee8dc35215d93885da4df9bab18c81ffc7d6
GIT binary patch
literal 9813
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
WrG^5xK>z>?{$YljG1*V}0R9jBn8vXH

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GCylinderBurnEbTemplate.xlsx b/GroupLine.App/ReportFile/GCylinderBurnEbTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..939c0c9dc81845409781c305d7d3afbc96da9703
GIT binary patch
literal 9927
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GDynStaticMachTemplate.xlsx b/GroupLine.App/ReportFile/GDynStaticMachTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c0c3d2024ec302cb1bd16caf6dce9044489b8113
GIT binary patch
literal 9943
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
D_uBW8

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GInsRotaResTemplate.xlsx b/GroupLine.App/ReportFile/GInsRotaResTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..fc9a094c8f0b1f7bd5b328e5cb92ff48df6d675f
GIT binary patch
literal 9966
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
YkE<xaK`;mapg=x!5E$3}qz~Z#0ITBxu>b%7

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GLeakCheckTemplate.xlsx b/GroupLine.App/ReportFile/GLeakCheckTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..463f4155a19045fec610d9e8d42d48d52809ecd6
GIT binary patch
literal 9931
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%0D)GGmgF1}fuy&dwA
z+q)RdDr09=o!7~&N?DOkv6G48O<JT<nYNw-8!?JCCoov)(W}KOo!7Y6OcDG!^Jh!!
z1q2M<al<S<cW8IpDsL3d5nA(~`AE$42f<532m%oi3jAvbTDZCWF9H#v_ve<K-01@S
z*&IYW$BTeH&vs#rkTK9H<ajny1yFrv2o@t{R}bl-9C!^*r$OJr^_qivez;pu`@BdK
zs^`iWwERU`ciA60Qx={P=Z%)7>7E9eY8P<PtAcNBtq=_nvKz8*(-1phM86vP&QKjC
zC8L1C#&9Pc+khd0VqNvi_&Wi**(BYw8P-Apm&Qu=f~Cpr3v}wkDGBNCRf=v*sVo+*
z{pfwhv3r7CZLrhH5eG6%qnKD=*#x$|+S&BRMoJ~`MeDRV8YnhoBQ1BYp!3x*8tAQM
z@r!U#iXpXG)DUU19>I4m_IJRR$@w3R?@$H|C!c9Lii2m%)y9{I%k(E$Bg3Zaa8*Ij
zMBc%mpg_sXtAm?$*G^TCLx6}2P2XBU_AxFowU8G&3I<kW7)L1SWP?K<eLIo_4ax})
z3M{y$49U&MWB7~KeV(@c*B8vJ4Gb2bfO|0R^6o)1_OQ3kcS%3KHy}_G`w$4d2x%-*
zRDxy>JFW_8OTk-7o1u$1phucx%x96=qhcjk*OxC=f9i)n;u#5<3n9z?{e_(W{D1#B
z{>$q*+UkD?`1`8@|1tb|e2XB-UtS!zZFswV`rC9EQKP)oOucRV_r}t1QvhHOAte6)
zZKm5ex4R9$k?3*$-yr_cd$^5qyRiBjB><u95Tm(WX1xt?dy)GafRFSS!0#pRZPVLo
z`?u)|#UG}(wfAj=+cNVv0vFY7AN;H6ybX9;wfzR<q5cJUOSAo}hPw^=_u2n9Bmf|B
r7XbK&7PxKx_ssoQ^A6g-nE#o_wbjuOF$e(QAU@29Fi!YMAHe?s9ZvhF

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GLowVolStartTemplate.xlsx b/GroupLine.App/ReportFile/GLowVolStartTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d55fd553126982211999c2797abf01cfc216618a
GIT binary patch
literal 9903
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
UNH8A+06?%01I&%xf6@o=f92ut0RR91

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GMagTorqueTemplate.xlsx b/GroupLine.App/ReportFile/GMagTorqueTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..e63fad3fc1b506df4f89ebb9443da51ac6d15f1d
GIT binary patch
literal 9912
zcmeHtg<Di>_x8{=z|aic-Q6&BNH>Udr!>+bEiEBPi_#sE0wNuPNDLuJi*$$lM$dUa
z&*7Z!FL>WQ*X+G#X0Q8tX6<#a=YH1O8Y&2g_yA-8DgXeW20#SE#$Dh507N7J01to)
zZ!F{L;%V*TX{zJrX6<3Z;p^-~Rfq`Bln;Q1UH`xBzt{s6I)g4fT%Zp99ZA_vy_kZi
zvNBY%Rx)F{EtE{(6a%`ZbuiOSAft_@ZY^pzy{6N+F~hMKapgRNp|sRjCypyabviSQ
z*Uu{555;d4^W?&cEA*b#C&lsS6Jzf0BTqG=JZPD>;BcV1qoF6{Z$RhW>^@T4mM)K$
zl%eln*(ig*oc$&~*kcH<!t6zCA><pb#ZIEUq~G4I$-}EhSDo!auFH{j{)`#FR^x5M
z6{XV7&?J7oNv$1NM21qzz5?!zGY=(@Hxdn0%Z-0TWgCLbNxRrO)WU<_JMSA{_DzAf
z_2t*9CNI+)(Xfw6@w)ly({(;?9o7;tj<Y<DclichRmQLn8CmbDoumEmCAJPYb!96)
zCJG(jqRQn?I`r#^K=p_O*)IZ?TEF9*ka<+XZ=oHY=m`=X5M8HXC43SRO3axDWcZj9
zC0B`@0ue)jyE5)}vuE*Sm*r5b#g~N;$}j1MSfoE-JiEI?0BHP;rj5E>v?s9GdjR_t
z14dI*cWWmPPL7}Z|Izcmn3I3`>lG=g>b+dR$bH3|sDbn8#UzlliVsAwjanxtL}>xL
z@mUca>0%cn8AyjD96=$tBj{!bx+wN+XMp-_m9HWW7hjaN$)_?h<La>&3JZgKy8Ppc
zmG?N_)2GvCSqjR2Ox_)dEafe43RDJ{Y2~L5Wotp>9Qq_^c(2GJ3B|KQjXtOvE?Hbu
z!A(nRf3J+JX%@`iNgdA)o=Gp+#*~Z}ey}^4MKIuDVLMk9FyKUedP$<IZ6|DBW0C7F
zLgQy@<@D}YHoFV&Hh^6%XF!XF5BGv+T%n&n|1{XBf$wnmrQdr&wBGW8gTb&k$~Q}}
z8S9@U=}X73IfD^o5g7o$hIz)<iPOi`-O<9;)$!*%R-vouI?n|P%4@g-U5cxcr2sT#
zkl+Lwnxvg)I;nISxZl&n@IsmM%kBa<rSjQ1P1;bMOvf&778h-=Z!A)6Kj0Ch9MZ^M
zjL0LiTjbVQfD4y>EbGI8rHaW(@kD&G#w;J@_OF|d`H9MfH(3z?=-@(~Ql1(%@M}KC
zqxg&lz<5|(4ii`3WXh|2x@6{8EaPnbO@XY86;h%RQUQqJoP=y8G8Fp4?4Ph?C*qm%
zIkokMkl7O@;WO}R%anOH{Lnxi>D-N#kmTh4ZYx7K$Obr~qdT`2=iqoH(b+D?hTiQZ
z+w*z@w?U#EV16a}cIri~v-u4JQuY*C0C2DoG0>tl5=F1)j*j&%WSz3R=GK}II9b++
zD|I9hvq9b>{Klu#4BWA-G(%<Wr|ND}3Iv0b9n!euQbCQ~YmQF>;51{($aL5cs;68;
zCF-7_2&*FzYg`AFykUwi#NotObXLDDuPdu9N(+yEMtb$yBCKZ#4h<qSks?IpAxzK0
z&yxJq4u7Po$ww;4JNVmd0x#)VuxeE>>Z9lNtsPcK;t69{*1~NC^h6H8w^<!2Ou~!U
zcT`%q-^dJ;GRV&tF9H*&5OMgVb6CvZ`SP?!SS+M4GGU@p&FwFstx+^n#2Fx79L}8w
zh!Okr+u*MZcov1)p0!y*PiXwVw0yU7`uZ6Ik@kjaqgZRZbB9DkmLu)ry_cN8GZZMK
zFNOA*t^ZwSYw!$TClPs##PS~4WVlG8!QP3&Ao+lQ;PqD@sxoKG>{&Pu6MssBLaofn
z#>L*Yyfk+0{P>QhTvSqsHpWL%<zDhv++rmzOB!{L9+xF*ebGCY*BrjnqpT(#b6T7+
zM1G6%1e06I&7^OmKGW(@hq$$z@k))T`2^UinV~f;K9B?_zB_;0wCJVk|LN#K^OV;}
z0@QtEfLw&OTAU;SIhP};6FuziG1ccbYP&t+Q675fMKs*%FE*_Oad64`Z%m}#5h2di
zG`*;P68x_e36)68IEGQ96-E;h04f}eB7aOJe<jL)rWH7t>Vu*DcW)J1sw(ecst4mo
z6qir7Hv!I^CnwFW?l)}I!3Jh112u2Z$ucQRtBJv96;1@#NWcBje(!UBtW^ZO({9!`
zvABp&@SOHVkz7ZQM-fmhzE@I&DInqD?(Tdm|Biw6!UONEM9KhLF22yl1rt3us;GoU
z_T=qkB%i|=mluzN#{~HhEUgYVtc6@fXzx~rH8eL<y<oOkzk4eKJwwh5^P~KD3`SED
z!}J4u-1<b#deJR+hI-U~W25Rf=Ga|y1zaa9SD`557Y~T^q>36)pbTbC@mMd+YSZ0c
z@sz$EV(x+-u??T>+pG=tPcOsn^gpxeF28^T6#@XD56h~=uq*z|svdUM)}9`mzYg3#
z(`!yDGyzHliri;CB?p~zH>IlLv5u9^hqwCZHb*&z^>d>W6AhT_o-T@h5i(@fC9SkZ
zK)zd+MEKhG9l~0N@U7Th<pn)6{RF!9pts4St0|=duX4_&bKi6Of@01uTi=gv+xnJf
zpE&}=AkyEI=Y5w6;)OqkY;bUsH?(MxmcQ-SZ?mbYe^<^l8M|&TV*O$`{VbyAQ7@Ml
zJJJGa?exSIg$3ks;$fS-w@beLV@x%VwmENFbI+*g=Q@*JvP|?w`0C$28+2-Ao>OPL
zL9ht-$?^`(@HRPf8t^|0X<s7_RwQ2X+zMy&a;Oy#-&FTl;n|oo_QK_AUP7gZT+}LV
zfTUeG0^;30-g6eL<taau6K7Db+4#2Kf<FgMtrw>F_E5806mV?!SNIMv8FN_N24vLu
zRDXDXJk84lqL`p9qD$Kx%2d5LKzpr4*Lne=a$i};+LJ0xkr=7%36{quD})mjZl}O@
zNvzG6G}eNQHV-X>Pi6EvnYV>hOD-|V2|F`y8I!(!uoO$BV|#DJT$bVQ1|LThu6$(1
z6fZ5(Bs+Y7XYu_|CQnX%Y>Ey8Q0uj{Rb;XdpNg8u8e6k`Ug(q)aM6scPVZ1d$#;3j
zms*5;4dGR>2^O^Au9f^18^3l|6D#OFR3MZCeXzv4oF-x*o&#Y=WM+eeQ{<*zN8oEY
z>Y&!I`}<hJa7B%f?fh2<dzzQz=EY%cxo~Ykae>Ms@ZGA6n~daITox-Piv<_$FTZ~$
zks%AN)64#Gq(vD2lH1Wit(fcawM3OVy2m@u=MN@y(H%NhHPCb83h-4qbeIL+3Z)m`
zqQ$;`M|tad42#RVyI&*YOMsyFNCD-ldDZ}*X=s#Rlj@t`N939{*fYLKO_G;W-`CmQ
z>*~7L*T)qu__$u|^2JJZzW~wJ6@nd;n3MYk?{QdR6<z!+GC8yAUSznRLACdnv=1#-
zmY0pjZngqnucdKh5=Ewv>tdWk?_8qJK#UL#(JQM<3NlvnIy1w4h=D4C;Tbto*QXNB
zP3^w8QxQ4Y@~&S)yD#WfB}3REU?UG9`MK`?#VSubYiDcDU;AH#+BF<^g$m$zV$a@D
zZS5H~(a&M+;5RujI;J++EntaH3OLsm$jTI_lE{Uc_<*_cNxi`}P^{h%c&L5Gtsr~T
zUg9h*y|L8;!P{i`#R+0mx*h*S%4Pqn3z->LF|{`yk-TaK^N$^8#Adp;BUF_{_FK*s
zdX<O0TBNq|HPcrU+Iki`YVR&>XFldeKMo_WQNN_vX{iOpbvQg%&j%kmI)!Tc3RoJ3
zAuiY)@9@cNei1B~Zryx3jhOt&ODin|Dq0WDGP9*KX}xybL_lvY{ZeNxU5~d-LQ04(
zDqg9CXnGiJGX^dsC%Ve2JH`oOdl*H-@deU<`YF$NvFnkX|5F?SQ78Vkf-BZt^zdza
zlhdrx{%o~C$%Ed#4_)vYwa-ZTP*$iGF0=uBS??4*I9kW^XZB9R;mbphRO0r7>X+Yu
zeMf^W<2(eDBoV5m-UbI_NRr8e<Y4E*5;gCO4HE-?oi6kUcDO9NlK3LUGApS!Pdow%
z6rS1%CV`8h^n67RqDG&rw97*Hoyt_axh+d)bsf>3ysx7M&?V78v=k}`eIpq(`fv)Z
za&R`IM=Y7zk(9wvHr0EW9mqEslBOo5(fQ)>e2#+{nFo~&gZ(S1@ocjF9cYhCFpu1}
z$+&P*l|GicTNscPdR7^?UtL0jVY>YCx;gKW_%+A=2~F;|i;S+I+oMED(@lyGM#w9D
z=i{b7e%$n7FW;OF^TwUKM1Bwnki{K&3B6c&+mB29;;AHst*b3}EDkrD2C$R83I!xY
z?(6^b4dzU*4JxHoKBvH!?xW=HQ@XMAFoP$Z1dPZBncVZ1S^R)zD^sHgg<(&ZeKF&m
z7Jt;2b5{u(4s^aX4?}8jvxk{JAdj};zk(lq9Q%|uuU0#ry~tlN8fV6mXOP&IcSVd&
z4I9T%QQpc4U(4Q85qDsCNFJo+{C?vibjtFRz>b6jZ}Nc=l>@b8&nMKca7O59vkwzA
zq)$UAsd1o+xfOLW38ZdtS-F-&Io<dkF7<CyyL}srm*JgjU*Bd{;o@bXxjP*DMG#LV
z2YQqAF&P>Nr}BNSH9gQ~(p+1x?m?Ec*&wCar^aSl%-TaiB;D?Oh`JYEv6D6gpRAsq
zMW2C^nYI5lb_}G)f>7of?I%5{^87Ze1clOQ>ibRrl7oxSjfBY3X!NPGNPGTLo7){^
zbg#(z2~n?Oow#ja%C36K_aFQ8{xfX>r_v@4yaV2ECG^Wrtu`$J<(b5BSYs1gjH*2{
zlS^dmbV$(}vlpC}2)Q2;8Y3VGjwjVU=3(fhqmhXD2v2y*-*}pH+;f^Eit)j`viij|
z1F`8rr8jVREmQSa+@X@;yy&g38{LpM=WIjo59zh78pFLdfxT%p@2azYNBGGzXGOc0
zS#%_XxT9XQRx4g~p9ZQT<e)u;^o!Nnjbp0}_)^ZP1O`09H4{56p?Uka=A=)Va)-p$
z`vKo}ht?k2m-ry1?hpXJMR_5mWx1$SiAFIhWMs^fTFp}xJkM5=X6+?beXRNN%6w3F
zqt&G3Q$C|iZ4jw4$>`^(fkymfjCm<-6K1=e9G`_6oOgb+i0mSJz_Tm2EVg{_mWMku
zB2ftSF#|_LKTOiBlOKOn5F10Nl4aBnk3h{4PNO5&#|qZQ<kKZ7Y?<DnLZxJXD=;wB
zFOQYt!T=t(@ufLwaAfD1ykutzs3Q3Mdgx}cdoqQcdXe$)WC1*7?TrnIK^lDl{F3G-
zbX2<jF$Y(ucLCMVFqnv;MB4jQMpjqGPqZ+On1DByV?+31%vNMVEA+io8|w!k+#=SB
zF9+l7d9D{{UYYe8-$%C12Qs>A74}3^*n)$O6+=p&%$}<>&kG!AeVccz43};k!_63J
zb>*VA`!qBLbVxaD0;-I17^ynww@^*c;Os?1Z4zqaS50h#YT67M-NOv3S#?*+6Und6
zQ3Zk!S3gFjF4Ge{e1+R7V1-H;csci&gY+O)jIfUcrz*!<UStoCbL&b|JeuVZE3wW^
z<i4&Eq*-$t8B!#G>hP#bKNuY^E;`jHDcBC&gM)8EkY}uO{h2YtDsaf#xhI81J5Q%9
zw&iL~t9<{*+A0Y2lF>YH)}_JU{MF(X7Hd$~Oj$!wjsA9&X1(OD0;F6#U`NCjeb<LH
znG(zBc@3c)f#eC@tzO&Y$+y$0<=rOapmY1$_|W9dBhB~lJ>|aN?=b#N3ZkEOrANV}
zpb{DYfceLy<>Be)WbN@&{}t<vCO`#1okUxrsO^rYmP*M$B}n@t1URkycP=51>|^R;
z4ixgYDsu{(A6?OjpHiGmzDAqu-%3hhd!<Bb>t8#ta**xXNgXwocb+4hDC?yY3y&ly
z;U4|QO0};*s+!W<B{oORQqz(FiFqQ+bIb4YyP)6e@%RNww2xR)(N$6kmC(jbujypB
zg~fq%R0I3sRfAp~^7blS#F>|K@3V-mf>s|tKq3KsZf`}7usq%P)cSml{j;Y!c-l7Z
zDcPe+Q;G;3-|-L!O4%0oD=N)`sdDD%#vt6NDdj;mfh%M;@j1Q*n!L%;_L1J{c*Fs9
z8FY(rY{{VxeRbJbF*%A-W=fW0dGtl$=VE9k`2-+-+=^w?%c9vV`Zot#x*Lnen>f5R
zhy$$0$~>iHn6D7lE9A`7kQ1@H?ygo6C7<bs3tMk?laPe7pKX0$R&<TeE#OYd>b0_2
zSIJ~mS&!C5>31+|j;)HT7j!B~V{5Kf-&R_2ZXz#M0UO&%5)YAKl`<&rnoWcIu{Q~2
z3ElFL8_l-kmQbFKLx@eg3R2@gm&`^%t?g;o>>Sjhf{)pT>-ZEW`9=$ML2`Nxw_9p*
zs!z0tm};;5<M<wgvRhw=j+|>vPe4jMh@?Mt>ukjHk)RiCt=M%MH665N81=HV9=})(
z$Ir~-<^6837cqvQS|W9Ys%jxpbZ2EF9gkCW)cla`dHF)<(fbRQJL<RNn*t1IDY_B0
z{;3PtqjG{C{MR3F7(2gS(JNwi%q|q$qrOP&g%p`vG#D3R&SDs7CsapyU2TNjxwgrC
z5ljhNdB76#fp^c_4O&;fEnZR{&pXRIE^u}*a!eFYfyme!$<sgeNmyBK89r&-ke~w3
zZu`K^-iVz|{#hrO9u9|4Ik@;(j=R617``L;e6M;r$nan(k10Iv2>cALes8nvazokS
zcy;#4qe7`ehsiH^Q`i}O@S|V%6;;*AJV`q`UngoAN5j6*-&jSAiGe)1EelV@GTkh;
z3k_<8iVZjUv`whqs_w|M;<g#K&$T}GY@2iO$)db!mgHROxI5gLvn3hR1XYS6yB3k8
zk`FGAH^H+rAOu1iLe5hB2^oIG2^}mh4q-1ab(dx{l+P~qL0VJ`M@`z}h!(ywb|!QZ
zA@+(o4)i;!3Y+UZXneua&>)>`1}k&>YSXu0N@`pR{;SLs6phP5g{|RzVQ>6D8Ea?m
zZf&LQ>2B|0`v-B8#8nU=ph*AjyP5~CXZZNZ9jZ8>UA7YxHlOT;p2giKqKqX|YOLKM
z%r}bW*2!u#nHR3@qBlfUrc6!goY==BqO`3Fa${It+t2!l^+a*Fp2etQVp+^CLm$l{
zZYY_TxyOk_7Mx8yA6Dt{w=gFR1cH;Hs|$=-9BKOouep;t*)im((-HPeN_BU5D@zA1
zjqsfhq``>kv*^r`US<R@!j;cE>+zQqA$7vpO{v#czSKfWD|H%S59*BTI_2h-WUS5j
zJPW|{xqa0tAu8R=NO>vVPY#d79EdVbFTX}@3bu*byD;3Da8dF%&je4OZtIE%JAA00
zIqb#$y5eyJOJ)CD_KG_5sC2_TCJpl(?H``|StI##+51P)<oDwDSIHzIu{*Yh3t#RW
z;fIW`f9mI_KpAa8nikzn1dFSAWN1dxIsUDGJ(=~p^>w%Lb%E?_u~JeStYo%Nt?*CR
zEQ#!D4*ciYyCAhfI}7+|>|#mgQyiTy5Y*I^WBQW}2rz1&YSP^j_XfS6t4%;FO_JD{
zQ;PB98oZ1nov0{ta6U3cY2Z|A+-F-0)DIUC*E0OEn-EAT=2Fx(rg$_Sp(LDSCQ+y;
zJRtY|D8vHt&F3uFF%S!}#Cc@+_zafM|LK9OrOVO**uS5~1ppZT@PHdEXgsamwXHop
ze?|}Iz0cen7WOVjW~gQwW^OhEwgYghG*r+i>g0k<YJ!0?_!N4nWB`>YrQ$VDCRZj8
zaj0BQ=#ErKvRwK(R<Anb#~tQKJTM1X-=Zp{MNABy1=D0^hVVrf3!A-nLBQ)R)#d^x
zVXK7x7(l#^_ayQIoUU`Fh04&SQiF-*i{UufhG=ULF|n#AB!DOj$lj56ciqhBnGVDu
z+bBIUHkc(+Zm0)GnyB8Gnr_&qK&;0=^ur^cI{vjj!ckhPJ^2pBeUOw|a8(coEyro-
z5b8-?ijD-Y*rZTCJ-5xaXkKV|#ha&@C!x>Dd!JK%HM1t=C|b;%t5L?8RA|?J39cZv
zAnpN+fp3T(65oVYm{Cb)QsYL;5I+p{>fo*^L5V>GSl@;=1_CuqKpKI>8Um;lB4ORY
zS(<3LvUu|YK$!>1P{=%rJTL)x2m~40A`9lXP$X?)ICICR6BJQPeFOQDK=A`Cms0iu
z7yV8f8d!5f8w<ihr>Rpzbs-s{7?~&+p`U9f`NIskoUZTgmhZa0G<}kK-H;4@LC!{v
zy%YW{>?4R66RrWoCA|_J`yDMhXBCx#SrPH<Vi18J$d8XC^y*5%*9kVi|4T4Ll}53u
z!h*pJRyf3g6%MUjEj8R--8?ugUEQt!>=OU4UI=qtK#H+SFBfs-KGL1cU|{x1&D*C<
z2#js+R0f*u7=z7~vnBK~-nZu^QPWs`!)t-ZYl8}_qi@-AI5kA7t-=BlsZi*uWjPYj
zo(y{Lp$pG*F&k(qDQaMlI8Q>eGiTED(Q|cl!+C`5`csNa+SMioGhbL#T%swLh(nVE
z#B|E6K5$Iq%)|%R(0&O?qUY%5>IU|bPgF9}kR*qx4_s*zh)cNvk<zH1edyf$npXv<
zyCaExGFV}_QBwImTYgd4_<%ZR-u9(>Ux|G?!!CbCSK{(n;`puh;zRHH)sRU8w;=*9
z?NUC+=Pym-ZH*T%&`U;_)UJ}kTU`6o>qjkaL>pR`g3Q9)DzM3SIR_nE0tdXAFr&NN
z1}Ev`Mocw>ReQHO+OBs3HU*v1in_brQ@IbmB(30;ET${`=q}$5m|VKPQZN4ZN~DO%
z3C;^x41!=G3i@jdn!CCEF9cz+_ve<A((MBM*$G6t!iwB`mgB+{DW#`b%=%=u2B7pr
z-&%x_MJ4P#$zZN^208LBruRJ5^BqM|!?O}KsJ1Iz@al|$)@lHBw&H1Kybn^gntOWa
zR41Q{cFpO|&Klk@E{i_PH*$O@l$e*pUukQjC8T5#m}xOG(Di5|!JA4m6L0va=aRK9
zXPJumTw1DGidH7ST_cknO^Hc<t&wx1Ph&K99YF3kjN9jD@7TMT9CaW<HHeJ^ReVIZ
zSH7Iy+DfhFx^AB~L!yie+e**hFY10df<*b+qV)MwVeqi>9AcOx(R=<kF7_DK7Ab{&
zh8QG)BPo|^j-u9cmC6$<_!YVznW7@58!?qAp-Egr!NEb|H@Am(o37nTln#MHF68|i
zMLB1f_+$d!$OtHCQ4y@+gp<t<1vH&-V&n+tK!m-J`U*HVUyqR)^#`0C2f5b_OwF|B
zl!4rP9F@I8rYsS!ohb<W>hy4wMcxHLuftkO<m91QBaZ6=8WN}NgssqJAmu}~afZvN
zoH3Cyv>!Lm*MAC#KPFf>cy^c&`}e1B{&WBSbNrWQaWqu^4)FKq0{&z8^Y|J@lD|A9
zaNqELuk^R+2&^i3uXB3e`0rh$-=+Y-K1@mc|9eXJaqhPkek0KU|KA|~(P+4ja=(=N
z8^ssa1%{30eqr@K!2M<IZvb|}UjV-sx%W-)>+9d9%iupu@2l<m2={g7Zv-&ueINX*
z>bwtlU$*@QBqjR=cu%zbtBAV~`uFMoHzWYSL;(Q&Lk!$E|9j^Ct9b?0U(El^;~FYR
TuowgYfUp+>EQ|ww(g*N=<agUO

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GOilPumpInstallTemplate.xlsx b/GroupLine.App/ReportFile/GOilPumpInstallTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..73864f35b3672549ff66a4a99eed9facece6be74
GIT binary patch
literal 9974
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GRingWeldMachTemplate.xlsx b/GroupLine.App/ReportFile/GRingWeldMachTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4b204d6225e29828ab228d3df961e4d9c03fd8ee
GIT binary patch
literal 10003
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
J=YPTn@PE_i2y_4d

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GRotorBurnEbTemplate.xlsx b/GroupLine.App/ReportFile/GRotorBurnEbTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..7f9ea6e003c1e94be714524fd44d24a0a926dccb
GIT binary patch
literal 9892
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GRotorMagTemplate.xlsx b/GroupLine.App/ReportFile/GRotorMagTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..50ea2522caaecd7df744c34e5a16bfb7a51c2996
GIT binary patch
literal 9941
zcmeHtg<ll?_W#liOE0-}mvna{4HAlUcSuO*lF}s|qI8F(bcvK8upkmr(g;X@SD)wp
zd@k4DUvTg2YiDM6=Dc4sXU_Y4-k)<uLj?hm0DufY1poll04afxaVIzc01*iQzz3kh
zKbCQJ^00LBFxK&Lv2-`$@OE^dDnx{5$_K#1&i~)?U+jSjonfaQE?|e=j)ZLIqo@K%
zSs5yMEBRx(EtCxJBz?N3uOv*@{)|?dy0xg?^qLOij~PxxL6r*(2GWvi4jh*T>U1U;
zuj4A+j>K*h^W;K`D;~wwC&cjOgRl+`kf$3_9=0r)aoEw^(a;m|HK6lsb|0&4OP5DV
z$k2DNY?Q%Y%zYCZ?lFK@VSWZO6Z8(%VkcGptk>SI$<6bKt~$$|LYE`uJdT;5R^x5M
zC0J=^WQri)sMdx=SOzR<TLJgRksFN36M+V-eL!$bWgUdfNxRfK(!!12yWs6-@=XEM
znzL5b^vw8LBxEunRySXLrq1iF-FiI6Nv8YBF7ME*$|&{`L(5&YbF^D;kfq<LGh6Wq
zaq##SRqlg?BcF~iRQCv=?GoT~>mKfRa`#I3EwrQWj|7MhiLX+yUwjl4jL%*Gq<fhX
zCsqlcVj>1(?#j5?%$>!OUz9_!mvRcFz+cjiu*q&=JiEI?0BHOhO&fK&Xurc^?;-3c
z28^c0Zk7)2oE$&b|D)%BF(?0V>lI0=>b+c;5eJIbkfHOLr39d~ikFmP8?{bAkkTSf
zV_Xp(*-{rHIZ%f*6hR@dBj9=jx+EI6Gemv1%3BeGM<7Dm<W(7we(CxQg@wT_P2RO)
zr4QG0=5*#PQ$g8>$+IJ#rM%@$fy(eQt^D+nY%Oq{Lyr^<{}p)zkyvK1;ee{aXR{ww
za5K`{dzBG2%>wy5$>UjppVCUUu_Pje9_~(M5)QeWS<hGb4LMMsUXbc)+X&g#nB}?&
z)A$%$IJ`TN&FaFx@ncuZ9@3)W#rwfMt}sZSe;R1mz<V^B<I^XA)>}SwI2;lKe)AbN
zV*MvcJay((zrzT!hztPWz&zva!0F}eW^d-~Z2xl{tI#!a&f+5Q&uh2~x>oBBlMGQV
z15U9UK9+O*)G1p=?h-=y?tKP>=FDBEJ*v`lyT=~zN2onG&-b9#KcIG4YcDf8>1a{m
z$9q}QF<Q!czwM&s^YrI9wy)@X9%|)kgB@+7IFOgSa;o3zj|myu0us{2m5bR#dzp&D
ztcpd~kjA>}zR=L(wVK(cgy++7;453Ek*3)S%ggJ(AVpO7Lk#64Vk@MMFN@u%gTv*e
z$J<IrV;v!4j}eDY$E__x7h5%e1G=Yizpa!?Oq2U;k?AhA!Q9f(ZRAM%<=K~B27*Uz
zco}MGBl>jS!^Fp!`Ee27qweN-xx~@CH+Yf3GIdx|d6^?Cxv4JV!z1(NLMU7g0VG(V
z4R)2@z;^Y*XXlG-yn@CxDdN0SGm4sv2@fq<<P4RSg<fP9*Tz5DI_49*22{)HA`+@}
z+r6#&N@ZS?exf6Z;wJHso=_;!qt6{p3#xfnR$;fR*(24rz<#6sK+5zWDC`{tlhS&k
zj}SfgBunC@&F)xL^SNZenTvI18XpFvi$OpFu{zqo=xJ>>rJ;3iVaC!_2!;<@ZDvOz
zlh6{*9hDYdDToA^9^pG30H$@3@~#BF*0Pz%4bw}A6*<N%g@fyB%Ml5lTl=6*iH0N5
z;n9<iFW6KnqV{Rl(F?TIn=dfy3VI1g*|uLJ@EplHY)vj(hkM@ANa|`Rf*>!WYPh7)
zWV&46FaOAFpVDaNAbR$!jQr6i6rt$baX!w>41YXZ{KbNTaMQceJy$OyGOz&~K2U$T
z!Bp|&fYEXk5wuoSzR@kN@!rp)kI4aK)KgTx8ku+$q2-?h-`F~PY<T0f<I(S8QQnHp
z{botqK2j<68(q^hO_IEJL1`J~mcIX@CheB|)6}{usc_6KQz&_>)$;6^>+5o8N9U{a
z-50OocPB`_mRtp~TUjJ_7!Gd-ee|7?t2@jHM#E5jI29X0Vz$#b;I%^XNg+X;TeX&s
z4fV)@e<Vn-cuM*Sj2Nvjl8^#W;a~*$Yasb2P5w2gz`-;h4CTLjsnAkY>4Rw=j9Uno
zSC%Is?z{&l&93e@9Ms_kW+($SPr&zOGL}{&{aF=G1m_5!gRw!+b3W`<1pL!();H03
zh|lpI4n&Zg$4<r&P|fx#DMJ*H@bPwczLoD`V83+7e=D9e#Fk4SxbcIDo&-`<LL>YA
z?NkJ>-3P8`+;;906eF;tI@+)vbQz|-TN%>O+)VY7+3M@vTN&sXa$blJc=Ch<O-U5X
z2Qazyk(%{Kx7-=(ar?EEs?P`e?xIV~ujJ(_lx2Kkei0s2kRb(dAaj!Y*TT#;-Gdbm
z>8lauF6c4a==TGw_2I#pW!RJc&zy==O^?Zp003mcaw-UR#@{*B-Nw?=!=3Zj=E2Y8
znw@Oq45cE7IAGk9pxQTgU>wt8RpV>?Hrr;K_X!a^$Ydf)W&HAN+4r5R7V|XGOdVY4
z@}?Ndi%l=z$|0hP<Pvt<wBi&=)`#>^U8Sx-U-B^~*W6}8y^`=G%6F4({ZN6EoLc)&
z0Pm2n+0=%kPF9e6A>5denXrxPEB;6B@ztLFPppIWG>ZvGr#(h^)7kgX!aE{NcMQ?J
zxy*_RPR05{Rw>uK;&vA$r&md{H#|GG<$JcUaaBr-C1jcC4GGlCXZ1UEGS0=bT%^v3
z4#@M4Oz<~3vl|Fz1+}jbhb!VQxNjbNj<yIUa-4LbC#z<JS7M@g%YUuLU~UttJ?3$^
zR-XHghyk^XiK|e)6cKw$yIVg|ylJI>B}06oyov^?hzxHnKB!+cm!CJI{I&@R%kh1{
zkjvQ>0>1($#;q*v!x3iy!O3%Bkt>V=BhnB*by}fJVcCX|RU8^mB0y~3sbO;thC<ER
zw#L(RG*04<&*g7YQk|8B)sk&r)U5Ro*IyyJ&3MOJCxwOUv&ud51~ArmKX^lj6Vby|
zY_8IPDM39;xqNQ$eO*+w4ge(Ej1ynz9}|o^Y$-&&GU6N=7;X!+Kh!BizLHA5Q|A$~
zs{!-YTby~(65;#89{%0kulTT-SV8Zh0-_x1;et&*G}2?@vpnvI$Y>CEh*&6VK4@U-
zQ}?>QSqdJ!v3Z!l!qlDPPu1K_KpUuC52>=AcrCl^Uo&m8R4k1y&xBR351HKDv#3f3
z_54U~Qa;~I=Y5(*QrBu%^F`QcdEit@YM<Ijc5IkNaMHMz6=|%$lR%Zjg89)~!IZ+W
zevN1j;z6y7z>s%BD|&ZVoxd{PuWRIeA%)%}i78jjy$+bAp;3NKre{PDmTS^r%lIZa
zL0(S%KxcQqtLw*s9-dIa<kw=SFBYl?1&G$pQaDlZ*|~4<T|)}1=wj!PDVSCFBSL-j
zt3AJ@476C7Uo<{;vF2a9lE#&Z7oJA0i*gLUbAp@!8KpEtE-fx7$yrV7ObiaB^i>fI
z&M26=K9+E9YWK&S3d_lscm0uGsuDqLVKDCok^Y>1|Du<NjisX{=dblIX6+h`J45*i
zI&tRisJ8YEo9O4UcL<ss810jrY!<P_ruZFe3uI-AlS$=*jl4*>^2t0&YM|J?LGV!9
z^cw;8rv3OiTKdNp4+U-#;g=>rsB}BN@!)0O%O5hIoJG~%xJU4)=`Xn2e-i!Fy&a~i
zBz(|vuF$JI`m9BAn?N&d^+j9HVn^-Wh4rV&+(_3DiW>C`%AJ;4U`&Tys(L=jk-bB(
zwl}}IK?vfa)yWR8%;pz?f|=IM@EOF!kI%GHf}kSxB$+1GbVjXL_L~Uk&81)JOr`7b
zw@Jx}&_%>5l@N`OBCS4<6jBghX4akH2CzMW&~SW_8a(}&_jsx6shn>(E}@76Ut7T?
z>n?iewyn`==Gb7Cn!m(h@BTm+yhd#t886BT)#49r0B`0yMR$(Y@%&Hwr=jrW!N)2w
z2LbiVZ%Dky0?lLG1rj6>swLkB24YB%%LC<L`$FP1eZ>axe!q4XdjvY1mYqqxk)oNE
z)SD-s0{IJ1Z3GfXiXe}?MGhfj&sW-IrT84mR6HM;m(J<hqdo7dqXy6=&`4=1R1kSb
zFlhAS7FuNEZbrU0XKF`MCV^O0?_+f!U#CkL8<j@pi^cNV4`XB;Rx%6^t|Z5@$qsg)
zJvG8QcG)K9!cA71EO#^0ColA<dfa|_0S$!7^NXwIyr*JU90%WNa=-mZ?+Um%j+Zdr
zq#Q6rUg<v{H@>~S?#EfaJ{{$WId_T}5cZSBd!GaSvG{fn5A-rzg3{XA`av}A12zrJ
zPWCDkpdf{}Z}=OmPrX*CV2gZC{x99fiQT7kAJRhfpLY^6A|GZvSTN7z12kJ08-^*2
zdN>`3KHh2ZMa`MNe4$}S=Uww8s0J@<lxYBYtc~Cm{FrNWIBj07b}W05uVN(bCv)y$
zkTuVWD4iM(uDznXg#&?>t%oAs(CCOfP|LAz<45qc`A7a8adDo+LqjS%YKfkYsB3VB
z=qYngUT8?427#$@p^CW`bx|+KT;MWu%}27k3EZ9P-zIl^Hx@6$JJ!Cw$*97^&qQ;x
zJMjqvO(*($lJ+wh=nEzD&ej?qYBOoBFIx5>OIU4?(Hv0YFfC>7qac!PcRoSg53Sfq
z8G%n!Ps^lFN6E-MSd0Due8hrK<{arGJ*AR*6H<Z#Hk{tu@k6q6^12om{yY|W>L}cv
z|GCZOPHJqw$nrUHuYH}EwSUsCdeYwQ0ln|1HosG8BRifU&$r@w<);>#X8!U_Vz{i)
z@hyhc?iq<CGB!G7XpLEm4xfo0JRy3FfFLlQQ0L0c&`C!l9yJM1bjsIwntjr9nk|Ac
zU|L!Ia)tq9d|2s;Il7*qdLm|5$#7ou*4u?{#FKNbq4!pLeXGV`zm0!?M$NP8Y|tKl
z>daBmCMT1Qln8I^8Lh?2GrEsMRbg__o<jPiYVF1ks|*B^j>&}j+(I=IJ1xO^2REi<
z;Y_(BqF)CA-*!jVpV*doAtmn+0=_|>A*EzGsZ@zT7!}gf7sxCYs0vcEl%!dEL8`8r
zIhUrxx*M%VB_Hz{WoiS+lu5^CAw!J>i5Lr#+D6PaJK0`~HMsA5<`CJ1_c6~dT{7A7
zJzJja&<H~i>Z68^iEoWkEE8QP6+}NERLL^xg@&PK3#HIe=wSzHWAW;e7PidnP@#g^
z-|`QQ49a6CIWdroTY1xbZ?I?Qp1NRX@~a}8eLZr$)IF8NPQAo<^nH<J+R_t8Dhg@r
zCFYkD7s2Dwuant$g1w8V1_pt|3?<T@r!um-GCm@OF(5*oXpRk`CsA7wFIu5}l5MO5
zm~czjE8ZN8bLY9wIP=OZ*Lf$|HXq99u2<L+PvZy-+gFSzeKbi`X<pzz)cUqyUl}Uh
z_yI5deXBDUwav$o514jIM@^V2V;qL6c6u#T6EwK{kx;7_HS()Q)&Vtb`i*WO`qiwu
zE9LPNm*=Sb0f?)UkmO~0!Y8lrI{7V7iTp3-T{*}OqeY4ONpY*PE#-yx@j16HHN_%X
zp0a{;t|Ja~4W*hjw~?ia_)+bicIgG8<HtlM8zuzWko4dZ7!l?@*14KxOt<hK@pSA-
zV$sgiDT{8oT-Pc;xLscb0&^Hm{pXw-d`(|1ZDF$pbbTsoD5}xhhG^DH>?%l=i}~#c
zTchuKktKq$4O44~<On6c)7?C3oBICkv}$>`2|3{0wl+36ar0QS55A||d+!e8Pnr<@
zv?~n)(}YTB007osgO<C8kAtQAPa#<RXzT@)AJ|E}C4$;+e`>Cjh^Zvi{uBXDEB~ES
z&{Nx}x~M~i{H@CD!se%!bYiEJ-=|)qO$}}(B(c3xBD40b9a=fea_*#te8@Y`7K)dB
zrV|a1Bp~h<`Nl%Ezd*7Y?CBJpt!A!i&Va-`k?FDJbFnAj^LjjX5sWs8Eg4xQsZa@R
z+<Z2Z=(4ypl!mHrTfC~@t3%OVrHl9}XTC3!_%dMC^&t`|aJIb_In4ZY<6~>;I{U1L
zI?0T6OgQ<|N@L0}9q;iVJFskv+a;A|!E`xuWMcpxWLkMxjsFtaMQon8fhKQito?oO
zOf2G%x(vG6IF7_fhn~7@w5S|qDKnVmL>_%fC{+~AD4!6>hgY$TdQmi&N&n_>OLt@G
z@g^=$4dM{%i86O7Io2zLuN878YRK_8U3Zr&@e*-*p+c6M-K3<U>}Oj8%!<yjxdjgr
zGJ7qozN%!fs(g*qMH#d+X^yUnsTXi4NnvZQR^L`yacrU}Rv~$8BLNyA$1Y`1-Zhya
z8N}Hnk|lD<LvA$Lj`@rdJ}w0^?kY%*oh_MzKrL-)*KO?7Ab}@rqjkKBQ@mq^x<I){
z4L4hAa;nd@h?#0HePehZ2D4jU1;0PnnwgL)aVM7k*sZe>%S(!0w6$W>Y1nkwmTuU~
z&U*54HIyJDlZR(de?RO4f@+E6C90~KaM7KGm2@m_)p7F^w$$>);N!j@EO*pz$2a*I
z(2{h+YJHOzamM5X-1)8sa2Y$-F6k9<I_4IOZBbvw_evF+nl(Hw#G1p<*M3nAd3L!G
za_8J8^F<&jWaS}C&;ZZArwg>Mep{@hJeFsUXPp1+@cjvKEF~giZv^+?^hY6Oxn=l-
zZ3Dsze4Fh<7h6MiHu<<t5_&jXBIUs16S)V24aM*sf#>_x%K-+5pYxbPV~$DU;Oh4`
z%PuyQ?M_zbo<A*=JhGemf<KLu-VZ;vcA%)LPVPb0(fK-F>v1IP550|5#Hc8#=Qm}c
z$=Jr5#WukKtx(a?Ca<;$)f?3vc~-nOgZBAWSC6)NC$CKKWwQk5=Z?Fhoq22051PPA
z5oG5g(qxL^<?$wXb_N80XhYChk}na%ZH(aI($WadB2#y17DM^mQomG-YT=ksdkpd7
z8e`{+PGZDf5&NM*dsQJ*orjGtSsEIo6HQ>%Zf|Y+_6rG(3xPk%%&QA$QZP&)x5K^!
ze>2v`)XmaD+r!P)$@(wiYP6~KauF;g{y-TOd1e9#Blmg});9nEo6tL%Grz^I4c(Gw
zY$XI1qK1L;YXJDKw3zeOif=G5k&YHY<6^?+qBhSMqb8e%8g#y_T|`3?gCxW8NX0)d
z>gPNjP$a{qjweI~3xp5o@{7nc@(<ZcT?ukC7*WfjBr3L4z0nCW-(gW{apkfH=2(S5
zgz<Xl9vB?9%O$y>fsj~G*4F4_-4Y(ZedBK;-)Ql%=IErd1Ino|*u<0H$EE!AK>Gt_
z_MFs#b5*+o;U;l%$A>JYxF_DUp{JNLgc*$!y8T1E+MiH$RJ*U>GyHg%;xFa8EWH#Y
za$c7X2tYi&Z@{6|feu$ApYv{a=EUpOdke1wx5fS3`YOkt{?VZ#j@&BUup`nihtmG#
z(4RGwzo*526;*yuj(?R@!s5H5d$<VX&Jk{9ynT~r!!c#F1!!7yHxbM(7m%Up3Fibi
zzV+mm@4kL@8UM<kbtPI#W`&)|_OTT{eBGSbrsmLhfxSzrR&ZyL0F7NV!E~CV^Cg0s
znsU@&f<7TeZMY`g4X8JuZ@%^gT4{p##=KIL57+QT4B13QnVsXYF-ilcTH^uRy1!ni
zu$Y#??d}VIu&7f}*9XPp@h~N!1QYQ>MWG?Nz2hJ=sc&9qx%U3ph$W8iM^DaRY5qS8
z1DT&MN{3)~KZ6GVF#hEM7g#KLSh{IjdU*T{D$aYqA8?r2Ivty!nrN7~SPfYZ!L8Cz
zK_S$M1sT+YLuc?w^pc4HDiN^a6?X<#1~({JE<1QfGAL0l?Hs#TUF!A@>wPR{HfDW`
zs-PAKL^4N0laUd`8(A!5(&vPL-&?B9MUsG{5_~&^copkG>;pLc%9Ro<LzhfV0+KI=
z<6s-1twF@XuAUIbL|H`kjJUh&W=7Aj0|jlP^vGCYl}Ngv9v*9=dSYq1;GAM&yJDgr
z9edUBt@jg+(NgWpcPJhJCDj6}0yt<nPJ>5Kzt<({i1Ua}3Fgy3u-X>M3l6P#6Q1!s
zIF+I|m1@nzl8mEhDPz7y8FxydT|0-Q0%Qj2ArU3H20Z~?2UnO-Nn}vtMaqDl1V8I|
zP*Z{ug$S^`32yYq)Gz{S_=7a~Q7eQ)x-sWyBH_wnO%DNO?kFQc3n=oKFEEcVfd<yd
z0{JbJ37Z&>4`R~@i>M{P0li6~1b*h9llJ|Wd`=r0SaX9L3qpctsFQ<rrP6~jGEja5
z&(==yg&1%-T;1I*-*tUy`Y8FjArbnLf{hwyCp0c(5(vVAYXEXduY^YLp+#n|qEa#|
zBA)#iM&QHbBR~>-b*bR(02}uI5DeX94RH@)!C(R_EaJinix$r28g9-m?wsb%ZkB)d
zkpEXtgt^WyNlHDG3lwp{aEme}(h%<GgjLg*ne)VqMt-f*w#!kLskoB+wgZXZV$$1T
zxmi6gz_wjHHT)cDVLeqDh=qDA8Ku0jlaQb8@QpLknoTc>I5h;Z(PTonqa#XgO!n1^
zk{+K;R_GDA5(&c&B1L5-$$&h0!8(Hr*4G~YS1L|RT40y4eiR7+Hk!c~Jht>jw?(*{
z=X8ZUTG6-$fjfmLiopdzcqx1t$OLyD>|0aUKKbelW8BS-d!IdKbLw7!dTRZ-FZ3N=
zGT0P8?Y+>xZu0fp&)eB7%Sr{L3}|r`1Vfcy8<a2Ynu*Tu4CuL-dpS*Ak+1vvI{9R=
z4RpyszU`qfD2`v$bl)bm%V$9xVx|%%-l`LcXIgs<Z$-=1pYQLNpX4mpXy#(w(ns**
zEncj!6yegQ$azS&1ExM-U8)!Vxlk!=^d0vlEChkD2nGH#1WjFB{uhC;(EEGIPU?1o
z{%jK>U1CS<$7MS)MMyr<EM|Q^R|8Obu4gGs#G(??M>?EqnNESci{-fh^>{~F)DTyq
z2Gw?^3tauAptb4;ovR4Xi1k9sQgcfSp6=vz(ylq(*;&UQ#beQ9`9?wDfD)B6x<*?Y
zDK06Cz)Xvgj{b-?f@D+a)5IHI>iI;ii#euZUZ<97mZFuZZ&%3V$J3$`Yc+B%^eK#{
z&O^w91~CVG>>c|*rpD}uQT3x^fEAPIw#pYXTU*K1TvzQgCP?6zkgc@*gQD)7_ekK^
zW~Hg&LL{Tg^N1l5#C?2koNO^H&5{cH4KPUk-zQzD*^5}tS1M1e5LD<+GC{&-8nKkX
z&;+iLz`y{p>zkvyP3LYUu${l46UE?0QT7=Y0Xe@XG6D)3B#bqbXsX$+fTj~plmg)#
z6JbB7z5>q0+x`6~^@p4thq+e_OwF{WVE+gE9F@Hz#w=m49Vv<W>mK1M3%?71UWK%j
z$jL)9-`juX*APE#Cu)T*V}hTkjWb+8vOfryq1|4me*LK*{u*E5;MrmF?9Z>}{OkGs
zYx{>6bu?7|9pK+z8u*vt&+Tg%N&fK)!F|K~jnv<!?_ssddu`SG#{b@A`fUmT?7@V@
z|G(vQALoAO;WrW$=Ks5hzXjKCsdXRaeu4EjN+7I747-~9<<|QE_b0o*0eFdi0sNl&
z-Z#Ckx__H)ko;wOUxVLAxGyt*BM6Y)_rV`U=Y7EYs_i$R5cw~_dz$T!8ty*mzmNXE
vAprn+N&w(Lw7`Ayf6v_iG#{q=hxy-mTtfv37J~o)ChWri3**e6^a1=IG*Rz`

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GShrinkTubTemplate.xlsx b/GroupLine.App/ReportFile/GShrinkTubTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..daed03561a49c563f7ea45de85c066a7205fb8cb
GIT binary patch
literal 9919
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
a|1*wjsvtmp5CA}je(0fY9QG4Ffd2!r`rF(9

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GSpotWeldMachTemplate.xlsx b/GroupLine.App/ReportFile/GSpotWeldMachTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8739ab2fa986c062b5536add09c7c0fc83bef1a4
GIT binary patch
literal 10143
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/GStaticDiskMachTemplate.xlsx b/GroupLine.App/ReportFile/GStaticDiskMachTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5de76d8c1edeab7b1c50f8511a303bb7bc58447b
GIT binary patch
literal 10332
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
NA9@&!Dd~Rp{vY(qov;7^

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPCDTransplantTemplate.xlsx b/GroupLine.App/ReportFile/KPCDTransplantTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d011ddf31953e6a11c3864dd185884f71810dce6
GIT binary patch
literal 9813
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
VAV7T(06>F&=%H>5`bi(a{{d;LwL1U+

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPDynStaticMachTemplate.xlsx b/GroupLine.App/ReportFile/KPDynStaticMachTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..30e51fd5f204b2949690fcd48437da7516d12801
GIT binary patch
literal 10030
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPLeakCheckTemplate.xlsx b/GroupLine.App/ReportFile/KPLeakCheckTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8d70ef6b1526d68eff1b113a6116bec95e5f1831
GIT binary patch
literal 9927
zcmeHtg<Bli^7h~kgS!TIcXtUMG$FWafFMB!2p(Jm!9xfR!GZ<}?h<4m1RWd#3{Ln>
zvU|Vmvito7_x3!~-7}}Fp6=>;tKL&}wA2s~2>{3dQ~&@#3y={C8FPUH01%M?0DJ%{
z{9`#+7f)*!Pt!-fZq^<qoIcJ@GzEz8%y|HK*!BP0{);V8{%F9ZiyPQxup=ekt{;^j
zQCf;h(M<7}ehVeTC&`e$VS|+UCV<ICTdxMSlR?{Q>@nksI7!6<qmiuiniJ=hktV$v
z#=BP)?%ySDm2(wBipuq0eMpEA$RoizJVc(VM|s$^V8Q7?cSpxSBv6OW2kAW4*p@Ae
zl#*j;W8Ex;znt5Z80a#BS7UijVj=7ks>4C1`qiMdRhySjpS~)~gHn$(<@^;3L5<eO
zx+`jxoxw?hJd+wbQc*c-Y5Q`x5@%j&Oule5U=0t!F^z37GS`Ep=D{Xj^zH>8f3saB
zlIAySl?~5LZ^S|-5@Pl8G-qnPKRT?(W1M7qob2)UzpaSk7&Nxt(>O=_;X`8W4|QcP
zIw1y)ZPDcLBz*U63q$n?2ih+IzBcdUo>F*Jz;B^_Kh+l^J|ezO!H%027LLze0Hk}H
z6DL-RLNO6Rn0s>Wc5`R36qjXS?4>saGSuJFzGIXBfZ^=!4gsL`H<;GzaX&bP`QAg=
zC<Y9srta2G9$cJ1_y2?Ee=#Qi^62GB>YCl$nBj-YHxd2kGfN3TSv7AN<rdmUfx#+^
zIQ6dz>B*Nmm?(gc$U+g6g4zOa2Ej|>uXg%r&sO=%WAF&X9yEAYgr{FUdyc}&=$@wd
ztbC;h*J}nkbC#*3>dWla7SCGNRFbbYu>3%A>bramaE#M{3=RJ+ML3Z}Cdjx~-RP^u
zMJ3#ftnPkAcy*&t-cIsZR?uu(@ivxJq{zd)$xOn24-4D*O8<T*TIeO2p01sUeYHi7
zyC|Knsg={G6ZxzT{9AtxjqH9MI)1zh-Z7;<hCFDHaUK8np*OxgLTKG({YL{KG1Mhr
zVHxY6AbDK3mvagO$PzLDfCICPj}w=-tGlCxtE=PBJXWr!?V80649u;&3-)0$gQu5a
z(8Jpzs;DSva5SaU!xrvDH?zrN)SkI(=L;)xe%kECToaIed9$=+d%fqMWxIgC5>iVy
zuH82&pwq*i|Cx0>XxW4$zyu$U7;V&020lP3EKu_1$G%hd#f#24V}xK?#22jA+gZht
zx=EH3<_s*KK3IwO;XQ2URTx0ikXMZy=9_9@9~<W3I7RM+P<NUQF}zagUu9)_=_D;Y
zP>py+_x7#b#PP)gH<8WVQhtlHbU;lWX=)4EquJxR+)DJ`?{uNnjr}tX6oFJXiAb-O
zDiJG_-@21|FwW_C0T!H;b9>_1@$-dP=5jW_St`d34B+bth*z(EWis+bVLwC-FXt+x
zP0+6(q)s|l;XnU0@+HDn?RDa{Vlx@%kYje4s&#XkIc;H>Y7*iLoQDmxeZ)Y*s=;Rp
zd`AmyIs4n2M>G&p6a)vULHZS>G^;LjG##++U1_<)p30zf&jQw^uC|8RVQ?4?h268g
zwU-&@nGS?w@Dj%mgBCFwsg90%4scFHq3P5vb++C{s|%OCOkCk;2|Gln$m+>cX_w6^
z`e@DbZmCFuK2{~h^|vcuW0xVQvfl#PdNS9^V&APW5UdeN$=FK+1_B`(wC5$)hCPc)
z@nePB#Lt}_oiOQy__G5M9}Fq<me`8mk7b1=LfWLc7f&q1*)k8xD)SJQKzO-Ll}8Ow
znxQH?_oDAk`_yvK!`ENV3*hx3U<n5DXVVe9_4^1Mcnxrur)`q*^^VR6^JXp%hY0Fc
z=(@;h9zN&E<9g^RiC|rP^9RfhpdaBnb6U;8eOe>rs+(*YP;K<Zou_OLm&>JVgq@ic
zSE55S-li3u@6bxi<^qY<*mIt#KZnYXQRP*>mT5TF>2F3M)ya#Xz;NJk!(`iO*2)7p
zpT4PdewaNTxA>Gm(b9lW*#zmwoiK2B>06_BtVN~;=b>=itQ+4_!UhS3)+2o25t2+p
z`N&z>iYd(f{|OL~WJ>x8Y@`_m5;6cP91I|TB$B_v<UdIT4#xRlF#GS`%5~J$dSILf
z<3|Lyca|3+?z|@#-Jaeq4(dQ13z(6XFYt7koVD4+@QWH3f@`?%;Ygp?xd8Sm0zR~p
ztt1)`@dduqp%{|u$jJx-s>OZ<RfrN2KHlEWZrMHt_G=IPkCI9K>^TI&n-|Osq!ES1
zbn>SkC&T$2M!BE!I(Upz4#I-!P~Cd)RhaHxMMzy^Bh70Tn~l4Va^N%M+z?;ti4#&Z
z6>%(Iz{J)xE!#z>!Wrsu>y3@N@2F#E;T7fvMVT5^sepukxF=0SzY=v2OOnS%L1v5I
z;fkm1^&m?J_?Ug@^w4H~pl@aw_NM>oG69kjdyEJGfG;ejlEAL`Gp2gjSzCL0aQ!;)
z{0y$y$tJE~8iMdcrhO@z14}0+bzL?Mf%=#)E%r-&0-b$4=p;D(N&@>Ghrw$_I>j8N
z)(FTQV}95aV~04#iIj#+>W?ScRaij!8LADtNrBhR6eG;favBK@ieDzR2N#~loF8ub
zSqfFc9U-Dsu-UH#7;taOBfM_u@f=@ObuQneGTnduaTLC)K$$J=-FAvS=i>!@bU&=_
z>3V`AyB>YHUB5`A&l0_dWb+?E#h(R)NA_*NufirM>GX9}?(p(c?6k!z9$Q|jntzRO
z>OvARZ1wQ(4OP$XaGTUITzj~WPya!36K1J7%C%Mb=HWZmhl1urUc40FNK-pFiuN{p
z2FI$ulbcWBvpc18G}N+gSDpI2sveU~&dD<07cv=Ui(;avr6bx&3ha-zR-Ct>+J&@)
zwfPA!=2Yd#fR2KxNE!0Q4SJorA~c0l=_Wqoz$apGc^?5(Q%~18^e@J?Kyv(MOcAqd
zozA2fS05M%r~S)rLbau=HnNi9rmS8skDIT=%m=}LbP@06Q|Xc|Pc3-ii^x>%!&5?!
z6W+yKWT{q%DMkB*O6t_;bX{D%765z<c_q2<c|<tssHp(;I)H1icVNFmz=u^k^fqtc
z?p-E@z#PtNBi`#4+?c4_U-|ZzgIJBPpm)&#QH~67sm(ONWSID@<Za;@b&^il^?I($
z_S%uT2N%~Za&gxa88muYA!66kE)gt>f!ZG;Dwkz*@dC~}HA0^!qqC6YS6A*B$4a`|
zdbIQcdvoiwn>$*IzAp?X%n){m>^22Z&oUu>jPN8(N!D{K=vdW4Pm8f+5&W3&*3SJI
zt3p;xJ^@q{C`@#78Pq29>(+kl_~T^IyQDD{s(9A{U+Cym-;o=b5QOEJ)!8$ZBqt~;
zXdXV=JLu@RI5fZ$$)DILa`|SZewdGF>nej26`!3`g8wX}pprgz4w;fg{UAKl*Raa#
zTS{+}mE~pqV>esDwQE^ixp>hj<k~1_(49-f8IVavOYF+(l8S=Oyw=R<P{vRl!RU;V
zxnsJR3!?iu1}dr`U)J&K*6x#fb*W(XFc_|a$$rkge__kh&f3|U>(~AltoDq?T)~0_
z?KpFHG+PJ84Gi<xI|L0*OpeJ7c8k~&lY-7Q`SNl_$z%#36K_)PJaRA6YA|+pFg(~k
z{Z@#h;UIqQ0mEafheEfB@Jr()sPsF2@zl$HR~K@#uHqUc9^rf%h6~ReXT@hbx5Ly`
zL=T(JmAX}jo;OKv6KJQc#<g@Uw$<ES+RjeoL_Q0ltk%4w+G(l*#<V%4YUYuCcXR^j
z`UqMYg&;24ob2$+LB0v)&oo0`&LAdEKi5eK28(?l%`~&6H)+0hgdm_dzW-KhF8cw0
zn~a<YT}+}v1<~|-q|GR40VVNOX6*@XAp4UDI?iu0ebDLL$4ebg75rY}5{fwqwB%p0
z?V*Qm+nYc$NBXif0;G<*4|+S`wQ63G^P{ZLEMDjW_%lB#dvG?7<;@;IL*dIn$7(T$
zfghGjNPR|vEMq)`5~L8Sq(24)VMtLZ0u^BAB9hfTMMm-dzfKpsgxXw|UCDfqqFGcl
z8^@ml1q+~dLJ6dW5&Ax2M-d}0R$Ap{1e{9Mym&0%&*?d$z38c>1<)tZ$>=DR6ZwQQ
zYJJ8nu*$}TL=Iarw<4*MM%YvxV6`FNq)VBaypPP2h~;-2z{ohNU>xXMNseWg?`uPQ
zYJzp_woSo}o2)WX=5Ap~QQ%qmxb^B190cR$m)DKCPbIE74^QcGb}!O90&kDwrA#4I
zy~fBZpU=lkfBd-ljI(?L9pZ~QcM0zm^_RyRegnQ({Md&_^7^F|m948SPc$wMyB20U
zM<ohSn9|4ZWeL`7w+$+_RUVh%x6b3lPAL6oT8QC`c0wlPqYRz}%S-`4qm`*~n9`7^
z%c1z=ohCojH}h9<S`PF+)lY(}@v?@Pdyz+42;RbvJd1w$Ah$+0mZQ*5ITCl)l6Qc_
zmTyIzUIPc$QCZQ-i9pBRQyH&+XiyQT<J_}(0h+R$7Tl4P<V!p<rg5N^>Y7GfgEK}?
znR^naB?}Fvro{y-=akn*#gV(gW#(88W_J>JxP17S-04$av<&ZD^X@jI5)VHU&E4U|
zH;iN|F~E!LGqaJQNHYJI8q*_PX6^Mw>n>y|n@w`MLs}f>rOX2qMDp$SC#VOZ<vS^Z
z@QIpfnGESD8JUM`(W5|pR)kX5NMG4Wwba{?ViaoQsr?;)BnKDo8%fcxBau*N(bl}L
zEpB%*BL{`nFNnJxYb9(0lJ+!{_J15Q_|3NXLuE}I`1-v*N*a_wtsoWwip&zYY|-&e
z##J5}iN$hukI2#LvlgAc67f7CdW?V|G?q~NjF+*Uo=!4q0-gveP!G*M>4Ij9Vf30;
zRK1>IBr!dz@WLEg&rm;+aHwEBFZ}4^MnCAqHCNaDLw0?u+UTG~@L)#6tMaVR5q|Q_
zS=sJQCOsJu-pKO@Rx8ixr~50z6u?~t3`<qI^`ond1k%pQgoeB#)#E!&pxnb-bMlwW
zIfLRGeSqD)!SyHh#okECJA{DUi04QtnJ#LTVi8PA>FEpPRtq%wsaYzrY~3X4&$QoM
znGfh~Hk%Yr=P}9E1d^+g!KMiP^#q9+3(~qKEOtBD-iy_^pM2*KIYbXI&#v4u+4H=b
zp6t+xMj(8M>OUs_VUl8<_-sN+d=#Nlp2;9I3^iLMg`Uy?J4hFcUyrPyX=aB8m73$D
zVE<sBB6gAsBk7op58Y{<BM0x~B?q&ACE=HMgEvc^lSv%3OHAKS7fGkAy>MirkVal(
zeoJu^K7PM3k&P$Zy@+aL6hzEeEb9f8lh>2;6)T7#A>@nZ+!T2dwG|%M4DOL`Ve7?&
zTf$!P;bfXS&w0+3TWY<|Kfw-pD5tkxZcjXgBQ)SxKBzKnma5jcAb6y+yWm(6DqBB_
zmp<I=%1vuGJvfT#ko3I)Q*DIPSlz*(iDsM*_aG8%6IZRcYGNB$-C|hp9%5L<rngcS
zPkD8YDj0~kIuVh)%s}|$End5z6)I7{<@_^F@}p>RqR(WwmD$#cq6hd~TUXi=k*rVI
zNFLpUAL<#)G-_`n%M=QtIy~(#2tvn?iA*+52(lyX!X+>v%zgam`U_LKRluN^b5|0p
zZtkPf=%%Z6owCCp>#IQE8z%FBIhQ&=^S4V|*ld9vv!!)~)dt%U+8?C$lw`^z{C7lc
z(f7Q`6REL{Q>%#-2&GQxZ}nRyPj{h}%X<yTf#>!$v7kiAv33u9SDDZL9mc;ALUd?H
zS_F&`s-OV?Sbrof4^LkwYmc8Sut<L-4lD?4C*Bf6ZFPiNsw85n$h1C1fYZtQ<P!YU
zKB_kANGWftBD<jR=@q>Ml<IWy9ol5yRzec{TNQF!zncD)qb%2U+KAEI^K6lL`R9+K
z;gN(S-6Kn^)IaA-S5bSpL}zPQYFjcQv5aSWZuwsB3;Dhqi(RBfo4}Titdv%&0M|pF
z&m_7nF7>CO8rm1F8g@UTY^~HooP9IjlSzCPxcclN5*hGIYcq0~C3JJTIdz@mi>D^(
zjBU(Iil-H(RAG;N#)2KF<(u5EXteXE%2*=n1MwoJR0lK!uaMm&=K1UBawkVxhr4HD
z5&Jde&@IMrqz2mzH07hk6{y~`P_v#WqA!W0ildq25dsD9%9l|u3+FN!N{+VlHkTel
zaQUhc``J!ZdEZlDy+zn4S1{8+j>qY^yIP5tdSwtQVh!meBMap?+v;Uec8$%+=Sj%y
zwzAn!%V1O6h}1*rb1-X+u8jF0<W!u(-dLr%t+L|WKv|?l`q)m2WRL>;J)`QL*$inP
z4unXa$SoJS-fTPOE6U3;84}Zu{N&g##d8s0Yx@W5b`Ba5K_~1(wfxGH{38W=Kn4A}
z+bs<R^%pwC%r#ejG5ilf9M;#M;d7mtahYNdV%h1=N1L(yWax!kD|YS14M#2M#@!rj
zC$CpS2{JPI`1TDC!bTC)i>0qn)h$E|@2qTOV{t2w8=tVJmMwygdoEb-Xg`iY1R2qi
z^ulWVk{5AC6ofnku6uEr+SjfalyTbT7K`jrU&nXL6q;MqJubkS!!Xp1tBQDjwHb2f
z+9LN&C@Ey+A!~3i-+`AKxc0-gL~&Ux-yGkV;Mvje32`hHB2#xbZ{O6kh^oRee8RR7
zVL86t_K};tF$cTit9DWbI9wvtprR86p1!&w__m<)gR12~qoc36%%L&Iq_5yU96(Ah
zH&q=@R_9(kEs*~1F!>FC3Mc(D{K(p&vbrXPCwW`@yLg?)k+44uHdhg&qGVp&mWC!{
zn?j20K!MF*@u3FqmT~o4^&LevycVO@`Q~SyE%PqknbcQ}Qe0o#?!NEL+melH11rRk
zT?@&QDF>Fv8sIq?5dy$<!DmT+M2tUTgpZb%25}adJKtw9md!1FmT6Ki7%^#$AzoZ#
zYL9CtM(h@I?C*0_7cqbIu>Lh`U7c*A8LZUpqs!2GDW!G!2MxYYGryIGhU3Esd^qe&
z@F!yJ%-yZ6bUoeeU2J~=H!MLy4M7GN?$>!&{m}KS4wcR?i;iZ_XbZ>iK=5N|%lwI#
z#>00eKp8FWZzzI-M8;9F50A#I4v$Qm0%cGmH;#s{k47U$WpZi)OctiiP|GR+8NK~I
zEN60aOY={RP;6Ap%XvdZ!$1w=i9>2##ukz>f?;7LbKe#fqefGmGi3{zBy=~UZw${q
za;R2VWZ9|v_Rfanjd-NeRrfzqrmX|%WgO@=UyG@k>#`^}ucZ1>&K5$>Cz8L>D<ob}
zr6__Kc1epW<{FU|L%Y)DrUWiLFx^-#-mQVB#Ir|=AtUQuZ`%ERHw^>Cohx0lu4}}y
z*=y&)>H+SjOgZt*D{uT-Z<MN=dTyyVP+%td=R8=<nOCh7HX;i%;)6eo__Jv8=REk2
zD$4KK@UI$5SbS%67dL^zIl>P)AHU=;FEQnGh3J~}AP5#$3&`N~gmZ#hzYi4FpEfq!
z#x?}AuEpPz+h8ZMPdCHAT(=~)t3L8u;OLO45#CuOK;sZkFrVUVe~qA_p&HefU`U8j
z^HQ7smZUqdXTBy5?R|pe=DbRjFZaM@4EcC@se|*eDM}reM*SiCdVoQwsDzHukG;46
zYH^psj#1^~u`m^p1T)D3Ws!b`{o`N@nO*O*9LE4`#A4^+p_4OMX#b}LGQVEF?}t78
z3?2Z$^oIr9VE*H2?XGL>>G{)<xbFSt;k2-KIW|Kz(=v0j>9_5NTcx7`N6;qbXV4P%
zpTQ?FNGAel#Hf|8c{8{(cu7DC*`OWi;6#PAbL?(SnICsp!?Bpzm>-(dg>^_sNaslD
zGBSesBa1}LdR!3jyWi__lP2J(fqwKOUdMV8`vRaF+$kVA`ea&C62&4oPWHhE)reTw
zRpXMFD2vEm;dghPEa({yB*EJ#U2-;9#nNu5N5|TzURc_0I8aRNXPD^UkG*RJ);|-C
zJfJyHY*Ri2N^1mF268^&gn|Z9PivDNN%DzL3g<EK*ldgCf<ntnUS^zvQYpJrY1YiF
z$vF#`GUlsQaVM2pb>EPdlUR^+k&2VvkUSx|0hOE4NM+FCMaq#p0X=WysV+u|LIhaf
zg6ab>wM>9o0VG<2sO6#|otSfUk#ME4=0|{150t^+1r$ZhILz;uKqFgZp}Z!l1PF#R
zPiz`tA+7W-(1#36;BWag=^$Xq7g|@xmIJEK4*|{4CWG{3(m@y*C>NkFHIo7%M%+%<
zcX!Ko9p4(JrQg*hf?rdz)8g!ez6zNDl3>Br0l8&YLZkQ5BC}UfsaTW|&n^ZK1TX~%
zkc8h}Dfu|TQvJU;L*IEMgF4I^%wUy7Tv#R1%GFZK-PO&5%hJ`|`p>5E{|bmO)A=Wv
zsC9G0>S9QDasvTbfleM6&L|pQ8`9MUKEz2MD&~r4qr7g<i}&@#2)L5ZN0ON$iguGr
zTDiuH%dNu;XymDs^-pxDcu#elZW)ea-zH6!rX}PPVH!gkg;;dMX2^0pE2P1Au@L1+
zU@@;}ojz_XmRLw0qZ`(CS3m_)y~}$XL+vveoZvO?CuVSI?hY&m!R=&GTe0g-@}-(4
zP{1hnBN}Pr&_bFnDH9Ci3@Mz`fg%=FFzb2ohl7-nd0^arGE1Mu6u(UJDcPu0mupKO
z<j4C!mKGx(Y2QIobFz|(=TGYvMmRqwSGf2S3V1;n+qgi>jgYiP7M&Y0&!(?|X7K0P
zIHY@A1CF)6%ni)(-F62N7*g596G`%HNyA@TTB=691G~e8$#2wRZ3BHEePwj2%05b~
zpTm6M*4xgZx&0k5Py1&;5;Zx+eGMA{!dw*iS06NYbNinQ!hG+~Ejy{x1^lxyh;)S=
ze();Wg*jYWU%QCy#auN&<%NN@C=sh#NDtXSj&(XE@*bAg0@(8tRbkz$VhymaD}B)F
ztdh>EKX|VEWk#$wQkI5$8fdDW-$l0?y0f#6KZM6>z`9FG;Di$OW@zm}O{Ao>JOaxD
zjC6GU2jQd;mD%wUe%kp&oy$4qB7T>qD%Qf4$=z#YisLD9skLeaH-;1@bJu?4KBJgJ
z0gkqVi^&lOVpPNE7-0DXy1nY<%+^+N758=Pj2RMjOvqMR-eF<qn_(pCcNXtcUy6_p
zsm>#YND=o4l(^VqSX(3&d^W-$3m8ti)NmBDp07|HUm+;hn_!Lzo2kcAp#~>#4+aGV
zO5EIjzk|4Ts!%%w2)j`BZ5C#qVG&RWdLbjAphbkSg%V9RI^@%}!--QOoMR#!1b--p
zbMx^Sp4EKF)pnF~&B)yNz??dO=YX@Kd(f0M?42_e(dSxyTvgFef#B<qreXy}aOSY%
zhM<-tw3VnCyo^cxL}QHcG9r6av=r^fP3p!^0`Z4G!@+aFIN851#`(|t`_J)TmgZ=w
z{awM|mkInw@aORz3?zS9G;m+=e(UtN=rF86d9RUrU-<8BrQf0ez&?yg{QsLw_x0TG
zHT>2@gZck%;vb!d`&#Z-Rex*ohc$&^cXPkSdSAi)8SZZdJVd_~{GRXL7rjrle~Ye>
z{vmpwc;DA>pJ)Eoz)XJM2LH-B?<>4d+kPu#rTC@r9%=hm5_eze-_!qZl>mSc6#(!L
mGH_q~?~(hj;w?0P5&tueYpEf@d=LP@gnfRtqGEo+2k?I|`2mjr

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPLowVolStartTemplate.xlsx b/GroupLine.App/ReportFile/KPLowVolStartTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5a3aa626fe9e4c2148db1dc0f3250589fb6f6e3a
GIT binary patch
literal 9898
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
ICw&0_2LpKYvj6}9

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPMagTorqueTemplate.xlsx b/GroupLine.App/ReportFile/KPMagTorqueTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4d16d9d8a96ddc1fe4b1b94726e3dc8889d8d6b0
GIT binary patch
literal 9874
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPOilPumpInstallTemplate.xlsx b/GroupLine.App/ReportFile/KPOilPumpInstallTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..de20ea21898d32b09da94772386bec153bfcd0dd
GIT binary patch
literal 9939
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPRingWeldMachDwTemplate.xlsx b/GroupLine.App/ReportFile/KPRingWeldMachDwTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4b204d6225e29828ab228d3df961e4d9c03fd8ee
GIT binary patch
literal 10003
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
J=YPTn@PE_i2y_4d

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPRingWeldMachTemplate.xlsx b/GroupLine.App/ReportFile/KPRingWeldMachTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..bb8f572a1492b202cca2368640e2d960d514b199
GIT binary patch
literal 9971
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPRingWeldMachUpTemplate.xlsx b/GroupLine.App/ReportFile/KPRingWeldMachUpTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..4b204d6225e29828ab228d3df961e4d9c03fd8ee
GIT binary patch
literal 10003
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
J=YPTn@PE_i2y_4d

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPSealInstallTemplate.xlsx b/GroupLine.App/ReportFile/KPSealInstallTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..76170a799861794aa0d34bc2525a300dd2c14e58
GIT binary patch
literal 10196
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPShrinkTubTemplate.xlsx b/GroupLine.App/ReportFile/KPShrinkTubTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..daed03561a49c563f7ea45de85c066a7205fb8cb
GIT binary patch
literal 9919
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
a|1*wjsvtmp5CA}je(0fY9QG4Ffd2!r`rF(9

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPSpotWeldMachTemplate.xlsx b/GroupLine.App/ReportFile/KPSpotWeldMachTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..144cdf8ef92d0573e3a7bbf6b2f0686148cc99bb
GIT binary patch
literal 10034
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPStaticDiskMachTemplate.xlsx b/GroupLine.App/ReportFile/KPStaticDiskMachTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..6c3b1f8adc7aec63dfa53fab7dcf929fd6b100fe
GIT binary patch
literal 10119
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
PXwVNm)QpvBf42S)KCDYY

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/KPUpBurnEbTemplate.xlsx b/GroupLine.App/ReportFile/KPUpBurnEbTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..19586b85ff28658bb8649dcd307a19d3850bf0b7
GIT binary patch
literal 9908
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
U496e<0D^xQ;V}08Ngu%f0SzwHw*UYD

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/MagTorqueTemplate.xlsx b/GroupLine.App/ReportFile/MagTorqueTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..a19e822cc91cdfc666a562d2563c16cbc61de10d
GIT binary patch
literal 9970
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/OilPumpInstallTemplate.xlsx b/GroupLine.App/ReportFile/OilPumpInstallTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5fba13d81ba1e62652062c36fb6203646f77c302
GIT binary patch
literal 9989
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
B8NL7j

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/OverflowLeakMesTemplate.xlsx b/GroupLine.App/ReportFile/OverflowLeakMesTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..102dce53dfa8442167de9d6af2d01603ef698bc5
GIT binary patch
literal 10068
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
bFXn%a<Lb&tuowgYFkl}#SQvw8exCgwP01GF

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/PCoreMesTemplate.xlsx b/GroupLine.App/ReportFile/PCoreMesTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..d4ddc4b06c4d6849712e7947322436c61d9063cf
GIT binary patch
literal 9903
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
Lb7PO6@B#cEwolbW

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/PLowWeldTemplate.xlsx b/GroupLine.App/ReportFile/PLowWeldTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..8c057d677da866034ac346fc9b9055f3e0d6e2e7
GIT binary patch
literal 10015
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
Y{J5GD0@MZp01)&;3pL}FpYQ?v4-yR*8UO$Q

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/PRacktPressTemplate.xlsx b/GroupLine.App/ReportFile/PRacktPressTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..fe23b0e7c3b4f40f55619c82b86e20ba197ecbf9
GIT binary patch
literal 9926
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
a_@8lHMF9rvg8%?B_(KDB<H(=z0sJ4Jf#W0q

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/PRacktWeldTemplate.xlsx b/GroupLine.App/ReportFile/PRacktWeldTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..c31f2a29c79a587bc92791c537b10db712545eae
GIT binary patch
literal 9860
zcmeHtg<Di>_x8{YL$`EycQ;6blyrBObf+|u(jroVQj*dkAqWx!5+dyk0z=1d^qlwe
z9M1Xvg7@8XU9<Phv)8)zUi-eEbw6uuEj0v00st}q6#xLx0Az$Br`+HG07N7J03Uz~
zZzAXJ=40#TW3CtIVe4(m8Q|(dU4{tHTmpcHo&Ue>zc>Q5dZTWA+`uk_Jt_I_M+v2I
z)zzpJ?Gz^TJ1DsU8HV&N-$<FSLzwKe^&3%p8MIxdOc;;FN$Qpujbx?2x^P|^Y0_I@
zynI^c^+V!DxmY2xqW00#w`oZNB_vo72=b?9l!t9gR-8_>ceD&d0!`?A+r38`yRtR$
zQgRGktXtLa7Yq9mqkTs3YAn7aR>A>MIvixGUko}swR!m-(Z4S6rqt)mI(y1O(5UsU
z>5@uiZ)}F3#I(_YR8)>i+OZa{%9WQ2lP?wx*vLb0L~S3A%tg1-KGw#I-oF$OY_YFI
z(*FEweT%R8wOHhITC#qL=G+_qcTStB7{__u#|Qi)FX|FF#*A$bG|td&14wLxq3-Mz
z$HWm+JJdxyX+HwHqEWqLfsQMHFYVuPPbj?W;CIk|oIDaDJ|w=%!cLhL7EUc(0_6Bx
z5~tUTLNO5|Fc0Ls92QQKDK2V2*elP=WT@7j{lF%_h4Jj}4gsL`H<~u<bJLx`u=fx)
ziUFgkxtFbrHy7v6@Bh*BznGJMx%Ju%b<KWm%vgx>b==6=+)5fyR?S~Vxr0V8G+bpF
zr}=3)J^4xx69rI@EDAv>tSj_-474KtbZ>;_bc4S(36DUGuEoDDHs{jQ7loD4>zSfw
z?fL+&-yC%AG*3x2klC**m9?g=s#I-sl}_=~5BWym6sG|h8vYB4SR#qM2;(7jqc2wH
z^>A~ty5H+!8(M`*_A;jm!see<?qW&Bi#$A-$s-)`wz6NW4<2!$fnJd5>pF-yHdqyT
ziP8p|+qk?xmM`eRzX|5hC>+tD<;Oecol+WRD1n9<H}U`Y@H}up2(7<n<Zv`HiK^-g
zEMxtXB(mzvf~PQotRMpbIIzeBxN!NqdpTRVyF35PW3~F)?giYy(Bh`M@Bk(YczPKI
zebil|y1KF!XLDM8Y~fyX3%deF?YX;dzUT^9vvxn`#*o5`>y;JztApSI`z8GK$Tzef
zwTEW}bOzW<2U$Oct(uaAnBwCRqfHvhz=tSBhe}@Ges}3Vf6}{Pj1Vr1_=MGVx1cg!
zH^X|`l7Z#@TO09VyocSq3ZrNm@~ZLUe4kp_r^b0WPLO-Isd_CwFg#Tm*kEOfagi1t
zZ9u%FeeuF!`skd_Lu6~en&0YK4xq7wG`oXLZ~kbZxE_7z2W?bC>&RRSMd*X;bfl*%
z^@#PEFTBXS85eZ?081{)#RIAA_@zQD3q@ON*2*cPqxkv);td;Ln2Z8Z*deH~wOr*i
zX^-j%sWQ$~_|M)?e2%kM%TK>jY$xOV;9OXvYTN$Il7<N_n;z}tL9UBj3Kuo2S+=DD
z-{DeM(f8f0L+Wi(6a*)!G5U3+XEx*LXgVO>yXsn}1J5z(fhDX9U2P2uNO&|gg@fn8
z*O*+(JSV~__>hgM*M9!ep`l^UCM^=FianL{Qo=Q3fh%S+krYbLwT&j-l}Fn;!<Wa+
zRS1f~abZA~6#bNkBWnF!q&-u((eG~_#q*5{kZ6{xF%NNsM$Uu-GHxcH%YwDf8sp!k
zJ}8!(qBM_Aac(msCY@wHN#;IK9IAq-r%^(`drpN!ShQ^qV;b<T7?{eSv?DM`dYZ1g
z?#nzgpWamdy0|12ySFM(2T?$(ooo$K72K%8v2_BW7}L8T9PI{$#5>I|A;0Nep8bN7
zKSEH6$-aFEW-6^AV5Vz*$=Ii;H4A@(^`ffO2QIZVUnpzbpm498plz<}(d<!={xDl4
zp9$3WnGCqwI7$;=&!F*!eaJ}sYyRF|LXm{DsX&y=w-;%?IJ_0oI3k~`?6D~N^L<SF
zcX3?GAwI6w2lA%_-_^@h42hLZk#6sVf%_|Kt^UbYc~+bd;gop~zLhlFcqHa(G}QA*
zYLm})S96D4FarFOA`y~VImfV(b{I{_0H|;<iu{pE{z{bpq!l=r>VpyOzk93IQCAy)
zsUD2mIBx#}KSJC^A1>Mh{e2wN(IyrUBMo2Z$tpQ(yQ$%4H7*4A*g(j{u-};g_67nz
zw3n?a5fAYRz6(SQ$$jE@0s+<Pd)<RbB_w>jgT4Kl?-<zm-uUk%Ge+2p2!yxJnHfmq
z$}4H*Pu|VM@;gm(`|>(@f216PO{*W8Hp4HYbr0$yn_63`^I7b^-My0oogx=U22xEQ
zlcK4JV+8`HcV=nW&U+P3QI9&W?bHJ&oqNkKF~3pNs6D6_kO+?Tp^h6-q6%Zl@cveo
z*P#zt_mRCCW9b1Mv41#$*lmsu&#l6q^gkgJ{?G!M0s#OJfX%8TurvOgRlOZ-ZGF7C
ze(iXEPOpWTD=8pqU<`x}N(nsUX~|UYcvPt0JY5}R&<r}wU-L|cA3`dm(hoVqUQl_I
zIIHNq7~Z=r#>Z_YPSHdw)}WE!Qel*#17F9T?IOf*b9=;pp`38sS=YwPk#&NaBFVnm
zV{-6xr5*V_K7CVt#nUs>-dubv2Qc0znIyL6#{8h*X7VjjjLt;bI>Vw$@5*;ByVA@D
z9GJTEI`7Bg&E)n`;*ka=h9G2%@9@==Og!>IuB+<N)0DKIbyUKVwN#s!i-hVLgX_2<
za)MtYDcHY=NPfyxFYNJ}(J}n`@H;;JTbix?6Ud^(*NunmlXr{{1+9tvcq!J9vU@lx
z4#4AMTn)SAmdAYTE;$@ejIvMsMa}RJ-hQme*=jnC<0Q@=z{fVi#qd>;vK?eCcX<~N
zJ(lbH(nW?pHNPqyaTxx9l%Z67e#oUiZb~?tc6ty8J{^P0{}5F*+s8MK@Rse#8W3w?
zaUFWTc}jqBnZ!Ui+i7q+T~++%NL}TnBkvThAZM_^)fBbR)8PO+6~p*u9lc>f;fTQ`
z8HPY^0!121lQP?Lw8qnO%MmN;ZO06x@SW#EPnwbnJc-sl6>v|lWU|yVaqd2^y^_Z|
zWm3PDnsAx5ka9W-R=yGyCc?kM_=$~Q0I^BcM(=|Ojn_I)!hP#9d#jL4abIgYc}lua
zs;``!R_bR>zq}5<$N-{6d21IqWMPIftV@e9a2KF)`(kZ9JU}R;nvzUrwBxqGb)5sV
zT%2%%L)C!8#hpAY9o<a``;0ce3{@F|u2PlIMOkcRVtut1=Fx+B;cVnpvJl7kx>7ak
zGd>c@#IxJto?klP*H!VS$e{O0V=BDn-2{B5rB!`NZeU6fU1ZVZ$W)b?rl_C^(K`V5
z^qfNs@I*?dzg4)c*{DNG5$)Y&a1v4ri>mNFBg^XPlNXRFS=7O?QGtf9{noOE+H9;Z
znoT_H1;1X&;>x9penNhe;2Lq~7Iz9{lF<^ow7Gad!Dji!!U!T`sE%NCO3B<aTgkPp
zJD3C&Rgkag`Bz4%ONFyX!`Ku~_H)hsi%~ufwyw5ZzrKHw>A+~p9VAH5jk9n^y#qFG
zVOYf8BWQ79a?WgVSjLu^5p-=Vm6xl?BvXhm^(W;nA@?I~0Acrs!-E`iZiF~mz^My#
z3??=Yg>KT}S3Z)U((eVOQmqDEp3BX<i)&PQ$MR_yE_pi7i_iD&MysocLfX!h`c*&p
zwn^_2Xg}LX>F8VTYP`F!pPw#@_l%@$(7brC*VYJ3>T=4~EFt~j>=L0HAZTqAiMVWc
zyvHxMy(UyT*S;MyhnPO=tCJND5_?OUXJJoo+J5D{jey?zYVD1s>|6X@GIAnxF^M`A
zMDri<c9W!Kl*E^LZ;o+8*&oNza<0h?LuZRkR(i}7f?{w9#askBN-x<C(4%%8O`&-c
z!vz{4QiuKEp&odx#;4@`DC^YA=ehv?y!Xo9ob6L3^I&Kcd`-lWS`sAm?P?Wiz(kmJ
zlDANr6vAuicVS@|QWT0n1=z8OWWzv(QEKq7!{t7qF1J;8vH+w+78T9bk7hu@GN^-4
z8fkglqX4nPxQQq0o$@jQF4by&Jl3xk^qtY347{NM(5KPL=qS|^1;jFH4dRyB6yk2j
zk6SZ$BB_$b*}Vp1bs=BpNST|yiZ78!=64>&$UUrM935WIOlFrK?m{y&#X9oXrQpWR
zRGF^vvNEJ7^QkxKyu1K~!8G~BRco=C#1$vxgtln^Jf|o0<|tLleEY$WG4lH0*_8S1
z?e!qe>NWHOU(%Ud?2u@%Jl^<o(E0MaVLX!j7^w&L?)E&1xIFAynB5%pC_rJ#fS{Nv
ztoeRBR4SViF2S|lqx4=V{p7Pq!zbN@Ovs11JWJMj0)SQ<bK_{G4?b=Xag)8aAk^oJ
zmnm9K^Z^Zz!yE7lJ}?g<PjnExfS>S8jG-%T)J^6n4^ocDoww#4C9&sQ7pK?2!F5(v
zv~eNOar9Bf8~HG%2-I;M*gB8+WIZdmCn?F7erQbXL?hKVi~1GL7(Hv@af+5KG@ObC
z7o=QN`z9fU+ygGJ$a<`>m%!WY?Yqq0faZ!-c-O|4H@WqA_<3kvPRD`KB%jhl{Ky8G
zjSNLH`9C+BAL=q|Z!X*RAxqh9k<&tGaF|!}z$l31yWNjb!BMq)S!3|&n$PkWa!_*f
zAYT(Ffsa@bs@>xQWoOi~Zz3yEsEj{--wQ@^a`V5I6#X(04|NsoEcw#maVIkYF1LL`
z-0%EG!agM9Kr`d}ErcOxz9SeaYwE-|;`dI{payEQZ55)(EP>0GnA&Fi+B-MBQqDn-
z9Id%v+2son&toDJ1O%a}v^So-jNSCKk_prBL{NcdXyI`mv``FV$g=Kr{v0ET`C*+O
z=7-H(^<xRAI>xi|cL5&sV}4u<P5rmBn>!6g;0{6XoQ7Zh>98~W%&Dug!}C0PG9tVQ
zUpkw0U;5dR`e+4EUm3&7Yu)C_4MqZK*Gxh~UXg~6du<WLkQ+<#80Mle@o&R`{e!X1
z$Bvc$NSS+tfc-dMq^vwQwR*8QCZ(L5C32f3>eB226<M}^5_M1Q=a-hF`djU$m9r&G
za*d(ns${UG!ALVfI>wT;t|^PdUZMYT1Md641w;-}Fy`r{M;?2LU)$q7TG2R!w+SOh
z#J8qdw&|YJO5&3U_3}&xQPHS{B3bm52H0V`Sp52AWo>hN)TmS(?*vE2h83|h+!#rx
z>;h;{nw&X!XD&FHgX;-DzZ|<>>7B{opjl!1ak5PM$<_}?CIM+8A9F3sL-^>`x9LJW
z;r?Y*Bcm{4#!6W~sGPjMT%cH45(yz+BIlOK<Aj~qly=a7bO+lICfo}4dH^TW!da0o
zS8=uNCjT`1_Cq=S&00s|PdGxO&b4DIvliKEtxJN3I{Qn`by2d-lXyAf?e5$(4zpvE
zm`)i#S}@fnIE~ev4BDta(&B>SL3Sw(iW{c(p$#2|&0dj)ui5n1Yf>pM&rk(J5jUpe
zGFKT0AHTrs7PLVn3b|PH<Rm{#6ek)a!>up0RTKr|bM0JeOT@F9v61Lq$3patWm>g&
zk!8vSQJu_s48qXylj1Xt)507``)~<N35!kiu0Av6*o2Jvx%OqS>K5x&C$?Q~>eN7P
zH#dO5=S-F%3vNw8mM>Ozu-QU;=Bt~^8w_^iwBJe{D9O}F1n-I3qaXN_r&D1YXEzWj
z5K5iU-#qG=IoXHSuO74@hn_h$CP$=iA88N3_tgY^zx$Qy?^mGEp*_#yU@}kz4FJIU
zBWZd21iILI|I~gJk0w$;g1~O#9Wm5SXQ;JGI;M(Drx^mAPRV<>a5Kk*HwlMIB|CM6
zWvynH^b*hqCo?b6W`=jtGT2|JklP0}j;tRRxOdaUO%|UOiloZ>>LtP>2}ydzSJ|i!
zmP)^-@^ecp)UejJW<+B7nCG(-c=25*@a0tUG8Ni1wsd^Gv{D_YdE0j`-D7!W<Qb}=
zW5tGHzaC|0y*}dn^TmNY;>*wt&xc54z|WoS$kEo&t=abMO^(k#nxu2~Nih^=b><JE
z^#Z2Cov7s7ye_G=OFz}H#5afH#eGs8)eyWy_K;ZQZ=x-pndltvpG!s@(Ue2Cn!=G9
z>oU-kPZU>p@QQ_s^;i*oMI>7s&9sCND1cYHih5DLkjGGUxTC+dVzQ0P*MK;}cC5<#
ziUR8e!naxl3k~E{oSwVO^;D^+22mom+r4CDQ5>f`LoCYf$wj3+X?guNcHh);+0?$p
z>!S=iS+pkBC%qMNsmx+;eXY5xvhLbKS)oR1;vhvbMuGi`QT4!Lj&vAjn@FC>qZql_
zVmIjvO3aiDiFr?HX7cCCg*cF{Bi*KhlSW+FG5d!%{K_-@6J`29g-1;{I~oe=PjrZx
z8!v;B_#Z}a*j`19pXtnfl&SP4mYwa@+e+pqLoeT1cjz{5Iqb+W?&n}T&fkb4$j#&9
z`)&x1o<vZul)gk&w-PPCv$2y+#;reUeaxO+vm9|WaL#&1^KNQekP$6IKe{m}a~Wqs
zLC9O+Y6zF9`|BlxGEUdRa)l#mermr=xusQ;Ng37xhM{iC>p0)bt;jp~4!Jd<jL7we
ztl>j^U_TGgo430Xl{LwH3w%?8r-$Rm#K{j3nfhaShd<4Vs4A?&r|lXM*5W(t9(p($
zbFeEu?IvY_!zEG;t2kER8E&e8?+QBuzg`VBI{Z@19F=rL`V{Uhc)R*yOV#OkW8sNe
zne-2*nKk@RI5~sx6JH_9>Y5Zj<Xzn_Q*}(@VSgBGZ6GEj$UM2Jj>^O~->z_o2yF+6
ze`xXV_^5uPzNg5B*J0GT*zW1mvFPTXM|IgM#r37@?#JGuJ=vr-uucrwy__tQa&&d7
z1)hTuAq3PEewq<P#CV$|e7LeQhO^Av`>KGkW?^MercJ$U!n8Aqc=;<+cS<)gV!xR4
z$gs1zh^5}c=6u$sCfRfgScyA8m!b1QO6x-CUuEXDL{9c1Yy=1s$pn8g*1^)t)<)OI
z%hApL7jb=3)l~<ifiY*1{tiwM9|GKTa8b+}+6h2iM}ur;jz=H2E23T=iHX}e2Rr~5
z=4Q<pfI&y==5x`NdbXCgYg9YSB1nN}v`}bMl6Itrm~SL3D!#CQG`R8VP@lHRBL!2p
zwc9RN;i;(=#tY@Hmjc@iic^_-bWgX01*Sj5PdxNqDdB39&obPtV+T!7qrhjsd^XT0
zSoN$=CFx4)029T201HP5;@;Z7ZyMIjZ(KNSe$i@T>epX(1%l3-_H^D2o3dZ#Y|mZq
zTHl^`yc$*l!vys|*RW!)ylTC$5XizpLH9=}eil6bT*LlR0r|a>{Z;>nPVG(X<0eoz
zL%5X-2+I5%gDIygMBApnjbL@Tgbd0_J0rLWdP`yZ{@XW?sc(V>SK_b8?Xc6?XWQXp
zHm!*r8V-Y&IC^9nh4+>T&^W}?EI)B}=Obuns3r`j84_YN#%R;uko1QREH<W~y-JhZ
zT2x60<Q~09BL7%h?c{o7j?%=X(F|eV3^9ljmC!M|JxB?m5_c=_nN&WSidGRxvyd!P
z78z0aeiUvcv+sXe<Q#&HSm`?c;rJ9bLH{!Xd0#GGjlk}H4i5le`Xd4!FckRMdg<Ew
z`22(e*S+67oK}u*M;53SS{5F5BlaV38?@A*IGXg*TpGfWQ}_%9>2v_K7?tuBZ!UK(
zFG++#VZ@$vc)G%~Gwgm%ncF+8@np<G%(rdo!a5`*qzk09xw+x|@f9K#18xZT{jYSn
zNz-uDB5p?zuabR;0|C%)+*uKF^qDlIB#ISqoa|$C4TxCSuRls+qAVl(#opcZvY_WW
zk%aG}^vT&_RZ4rH9v*3<`eA8%;6O34Ju%UL9QnTy*c>F9prZyWb}2)E(i&m)p`3J_
z(1<bAlQ$W9l6>Mb!X*qmcDrK55mB{OF}WuZ*_8d+)L$)Z$vMkcau*v^ac7h|b)S>g
zl30=Sk&2UElRPH5j;OVumdd5Ui<cvL9O2u=(@=?$fC#X?iD(YN)G`HXg^*|oqSlH=
z_F^v3#=})7TOI<cy-~)(mrxWjQ!syE0*&mEg-Y5Uq-|rk@+3baET@s)2L_OV2!gG@
zWPn3f0-;S!Y(){xrI8VHG?@|lGC2_#xhUrmpBrZcB8|9RuI}zu?|Rl+W~E;?rGxS*
z*=cb0qMk-h14*#pnt<H0>rsi{(c%j?P#>@;Bc7g*A_!m#5FiP^xKs*ofhFvJ0fYE+
z{N{%+Fj&B<fVi+KppCn=mY2JSH<z`$m+hY|-~Sc=V4(}nkkO3dCW(bG-lEKiHO08P
zVKofoJ%4OPtN69fvBy=OxuTBuwhKwnW;(!SwN<k?)Ui`CJLU{&X){|Dh=qD2ouIn4
zmsXPFvd@)n&u)-GoE?eSZ1GXFt1CfaLjJ|Nih+PbLDUZl6;j4MM9R84(ji5P(oIGW
ztZ#iGFVx&tbf`Qg22rE{*l0#;c<edLUdwPdPw30|bP{om!uHBglp{*R@v;PRkqPd6
zICf^P14}d+CwN<3zkl)h{QS)elD@_e-U~yQd`5>dv;GU+>z1HkaPi)DbwM^DYe<K?
zGy<gh(x_(Tz)E~^Z^*#I+TU&FiefV)$StsdeW*t+ZvQ(9qw>^6L+@=yr(!{zOVUi*
z$9I}Ul6m$%qdSQTZ_mKsn&aoI4cbLmw+yj-#mg7#tmU|LxaCP`Kj4*vAp273p)d^o
zb3PI^J;BX~K@bQV1^yL+mL4AeLm&)#e{O{ty>6hNT|J~r>{#&ALO14E=||cXY)=*%
z04h%mY(<G!)glMTMvH87D3K4a{FXpI?;n&mJ+0IL>AKU0ZOkj_Yy^WAYGZPf{gDbZ
zyq-mT>gIRTZGi6WZQ_5xV>MvirzCJeNqGL@D_vu}q_jK&3mrxd`Xjnn(ruObk5&9M
zi|INS3(OV#Zf&nw%hzZ2uaGH@K8Z_xZBX!F$YQc|A3+{AN`eS*bb-%jCY*>-4HJ`q
zwbSU1suy!RJDIP!uR7-}kf@R(cb=6%%6p%WBT>DydX*g`Li#~<5iwGVctD`a%@M=a
zDx+-B2!kwSJmW&cS<H5^PW9tDL9PBYb6oUXGnNV!D2;n8EG$&w`sT;owtKG%l~ahY
z8|Cm;dEqG*0fnF+G6D)(Tr^u0(M+pTDQ!2LI3>avCIUG8Z7rNffcN;k=0mQo!=fuj
z=2kjOst_J9XI=l8IcxMw*9Sy{Zyw>QioOp8T}8H4Dky^T#+|<jYDq#niP}M{m{gB7
zrWh~c3MWOY(QdD^zx~t?f8ZGoo&zSV{{2mw|2)6{?EmGx8ZEWIJNSE#|38L5_b*{2
z`Af(DzTy48=Wo+-Se5Z!7xcdI-#bFTO#uK1Oi29y`$PBr+;0>7_C$;M|1RPmO@sSh
z?w3Y?d+~vFbYWL>zfgML!Tn|GZwD+yza0EtwB9$pua|$Df=K@`y|13{d$=z%e|y-1
zm3sf)IQdu6dEeoE)%M%r4*4&K_cYtTYPkDO|DOGSy95BBlmNg#w7`Ayzt7x%H4mWv
bi}|1PxRx3c41)jwChWrqgR$~Y`T+h9!HU#*

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/PlaquePrintTemplate.xlsx b/GroupLine.App/ReportFile/PlaquePrintTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..7cf419f0217e4360939d0a6fe69d5726dcc9758c
GIT binary patch
literal 9972
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/StaticDiscPressTemplate.xlsx b/GroupLine.App/ReportFile/StaticDiscPressTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..81caac530d84ab6bef4fa4d992327264cd7dede8
GIT binary patch
literal 9923
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

literal 0
HcmV?d00001

diff --git a/GroupLine.App/ReportFile/TermWeldTemplate.xlsx b/GroupLine.App/ReportFile/TermWeldTemplate.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..46b152ae515780afb0bbf55b76994f04fb3c7ba8
GIT binary patch
literal 10049
zcmeHt1zQ~17H#A1+DLE>?!jGyI|O%Y+(K}-;0XlR-~ob#1PBt`C3qk>4WV(D*U8L%
znPKL=KX7mL*HzWuslB^u*IN6mv(Hgef`i8gAOes9000$0f<I&w1OouTBLDz+0AyH0
zDQA#}70AOx%h$!q-H6S{$&s=E9+oi=01LhTf7^d?1S+-qL7g1ft-4?_={B9{{K)ch
zWU>}AL)vYmbf08B+Qtna<BdOqwYqjKatEEd<ESD1u`qGfJiWf8_?jczmA)#iDcalk
zDz`(CTlrj>kfKVR`1gsiym`bJ5D4OA1Jcvxd2=><>U(NBLf(2*?yZg^l^w~7C^0Fz
zR_4ue*vr{nk^WA7SS2P;VsinXPz_cR#c#TwKB;qY>(IW-bSKwlOFfTg!mm~PP=7_C
z03MjY&oipE1qw=0h}%`dlsa)ypmRr{VApcuA5q!_A+pmfwG1?Kp?1ytyfEFBBW}rF
zt8Vl(xe*E(PmI&fQ=P8!{$RhJfOeeWe!R!iS6mg%I$&V6r*e*R=R<7u;?$X?=$I&Y
zbel4VGx5;3H4NE30^4p0@U7(s&Iy@&73?<3;fW4E(E-tQD(1^60fB_9dBAILGoqww
z!BcejVDvpHH{02>II_!%1<a-F0tt$hSBIFScTk?)-@^ga{zlUVZ4R0fDE6L0ThX92
zHF2|YbZ2M#x&I$M|BE^Kmq)KmR#xreK#zdP-$eGEPcJ26ODcIw$bY2L3J6kI#A=8y
zq$OQyXCTAYA_;|)3v3Oz8CX~njtBQqovrdz#^T}&(KLEjMZCUp^+aN(cY7u4TKT;j
z$7}j@`Yc0E(U;MyHG#RJxinv?f0;&h@=&@Kdz4L=1O=~{EP_xZBiNuvS^t~)MK#Q{
zq~?#Rh?*w;JaEcrX5h@Lk{t}Os3%YNCNc>6+|6y~s$cXuQk`CsXlvR&v8yr9aTBEW
zHL-O3d@P;Wj(7WlRVAxWgPI5Tf@@T+moD!#(4d~@a4_4qn;)gCqVJ$TB$lG|8??vz
zCrJuo<AYA11X)A`0I;Bu@o{ALc6M_xcXoF8*^gCf8#!lk;QQy+-v`~O)S_HU(rM#v
z6IN9fG&-12Yhwy@pqg4gO(_KjF7t*J*%`NZA>VW~B#gG6&x*Fs7DXQpS$4>5Qn^JW
zb=0Xz3mZP)KEExVlakH1B^;Nw9Fj8B$&2kcciwWK(sifOK?GQaN17MA&D6zkSTnJX
zNRM#Uu!KD=3#oo)Aj1ZXk4fiDqkk3e+N;PksusU8kYF11B_wi)$SkAo=`>|Bofgb3
z^``H5Uh#Li6%A%xD^LXWFpT*KUUee@BiF=OHVZe^jxbCUf02_T?I-dJ<cLm?4(w#V
z1`}2>W4B~BOucrB=wYsDY+@m{ql(1=Cv9)?UdArjzJC7*gTCjPUN#(Yhlwl=WtHM%
zHh4&i?GF)tQj8HIVKb}-4~#ck{5;bciit^Mk_b4uEJtcYE#||RVxJ%DZx$vqm^Sz|
zF3Ef~W#1|b!(0zYXQbyYpVhNOEov;h)7ICXUDFGSiZ?uayPn+f4F)AxNNr-Q_}E-g
z+cA~vP;F(Ty6Idz;LOFwVj<_U%OoX}LL>FElKGua4`$VSvz$?oK3h>s*zC|Z`P7{K
z$Utl+49_^0D5c?6P<sMSGv$(OlqMa9t?JEV`5torh^Zhz!O}>!_@2Tp6I!uSj`8zG
zG1Qt#J|U+??rhVrVPgslcLA@KVD2-+!u<<^tR!-N{CcfJwq25WDa@jaZVzSt_;Ayv
z_3_{yv~MCM)yo9&KeUA^N1KpFzJ8IQXmN0S<VzUc5c$+RRC8f%zlBTmNd60Dji{HY
z{4IoGZIGBa#Y=ZI)ITr7cRMP{gu5lIcj^lc%`QeUm=?ia+sQKR3UacexYGC4lfY8#
zW5rBjN|cs@V@Ws<%G-%CZQdG-a|NXYQ&Lau(sD!sw>&vA;l0&1i`BeozHH-VK0lQ~
zzTTJ4NIyU;NQI3f32i8g_pXn0GCQ2AiHEsLG?tV|s#nZgtYUFk#nl?5J`<hH)-=A+
z4{e9S|DOa27EOJ93~gzFl7s|+3<D*|A05eGY4V>=1qQ15pfvmM-YPYemAavt2kkDB
z!#mT90B6pFoqA7u7Yn(+o@s%eiaX$BnUuN3Nbjo>JDhWbFJ!pa>zo&J6%OyT<8f&W
zF8p&mM~D!D^YHO79J2Y3sz)Jm2za=A;N6NJXqa!@@ji$q_p#*Q3v6C6(g7n2OQ@w!
zK1@XL*pF~{a@o6&kq<zV>R|nP&{de`UR6kaQxoMIChLv+4^j(fh`AxY6ywK06a`@n
zU%>eG6xHL44w*CLqfa;1%Dy8G9feou8)OwqkIH#PUPO3MM)t{31TrPNZxm#F)P{Wb
zkh~sXYF{{F89aelulM&(FGJt-KOti|jiDnB2LSXyb1E_Pia&FzyRDU#hdcYP1Lx1=
znw7Hfa)A;%0`mBj9Q&NJF=d!fCri6w!S=iweE4R?H4e51!A)b@8xpi;Su9^+%bMA-
za(M@|77i4!mGLso=5bPZPg@LcV8%RGt#ozV>vj^2yX9->YGuH<gG1)8_u__Qne?M8
zMi7I%t&svL<YNdY1IgGTT}ddRx4i}L`Gx(=kSC!JL3X{l?;Dkj&AMWd{F)|?r$$OJ
zs<Mu}^=*-QYKs;()k)c;wg!tKlZ&9nC3)f{Ds#HDlV0Rv>DX1PC6Ym1)MHUgJhr}$
z)$BFyN0zHsY00lTNo?$MDKkzvP2P%GaQA%4@W{SbPIv5N*|TI^K}c(7FWTE58ep$E
z6f&FSW+8jc+E~ZDvwY$aKW1$v&)!vYp1`)5){Poj85Q1Al>2`5NueWW!tJqA=eO23
zc%!<@62S*SBtW`+5#1ig&Pev=RO<0BSg=WG?A`~+ifJc<B3>7{rNNr`rZ(X-#}ZCJ
z(yIzOf~gl3H-+l$RvVegFDEVEERUP5WzLC(KI4D1mO*PqbEc?Hp8FZa(HNb%KQxa6
zbw>b~wM#XswHM2uP~?ef3Jak7t8byI+abq@ieB}0nAft9)!O=<6Gf%siG<L_(_~i{
zgWzK&Aa$UohZ}4jIpBTzj%OYV{UyaujQj$M<(L^}2qiw!L4^Qjo_X>xm7(k=FLAAh
zik-Ml6Qr!6=K?lCOw3f+UZ|LiNQJ}xgqw??ld;a5Q@?ZoZpwk0;_FWBxHUcqLomIL
znhiOou~p}^i7srddUr!@*XgkHL*mBia9Wyu2unP72yxn=VebZKGxCU5pQPaXRC?~h
z=$jZp{8^&6YL;y)`Lma+WHF0G%8X}i&0!%I1-H@gqR2}Ths$?Ab-<r@%=1zLwNo5j
z<{j5M;43w?;#*Q(BmA%&(|S9G(v(D58C8hZ-hO-g1w<G3N&fgo5opCy8Ilig<1B#{
zosgANisu?qP)!>*i%8C-ydM$jtM|@pCAFv7(&Dng(8Y#t?OGB?DnW1(u`b#v_#PB_
zhRq<MCUj+a`H1YXS)HjqL_$v)PXCOYv3;t9eM|F8?5UuPbj80XYGtt?mM|#ef=GUj
z%73xW!`8~liv8FA7vc8wN1Ye=@Y}Fv?<u$U4I1g@Fv0kZjtmYdjkb%JA`^U0wfWLg
zMJXgQ!A9OdjyzH?V9f$%R}k!i-RoO^*2evWSsFS+%cuOeNw7;}#K^Q@zXXb9zpD$W
z8E0XYQuhdM6}@>^hZ*6Sj-4=N1wlyjxm=gxpl7rA4!-)U)t4VT7h7xZFKuSVbD~^B
z$ZJ$DAAy@|v1429(^T_-hYpUxnm&9M`XTU(*2iETsjU_M{OOjh@M-v@DNl{mpar4#
zzzkCxTBDY0hb=hNrm~efGs*XOJ0zrps6rxD3h*X}QPv~C0&=3OjJji-0G4Nw)NCsf
zy{A*ThD+_nGJfGW1VWCyAM>vs@1ch7*cqK>4EJWL_=_EM?f109s@2Am@*sVuT)fZ(
z@ML_JcV}xE&70Xj4TY@;K2nN>1iW7^1^NsJTEx2ZCyK$n6aNqxh$coRi!B2^e<E7b
zU8JAz;@9b7Cx0tw*_p%#A%;mowQ0;4o3G&1mOl|#7^&kUbPzfG{QD<q30}u?B`;2k
zvRQ2hl;_=bQ~=sUY6%UwN<yCqdbKY&1(sPjTTw$6jGqt`fsxkl_Ay!!Z(fU;7?nlk
ziNx_Z^rNL8RMGeMeou*Gk?w6pF*d?Da@ir{z)4XUuW&QhBP;NzHvDvTxey3d?U&b0
zxyB;bY>*S`oZXAp?E$w(31TK&k9rIczkfL&HMzUH`GU24b2`W!dk%`|5qu$yJCwa}
zvG}1Em-tP%*drTf8_pOUP8K!vHr8q+Yyol~zwlCwnJ#N&3d=lpzLk!nq>fYCkyjyl
z&)WzX5D(Hh=PfdL0Zo=B24Ql89w3OYA-LHOIeYHvrJ6mhPtCKS8r;l5#va7skNCx~
z!>%#mG`Y2!ajb=Y@=-W57F_+rHr(HZX;rXr9OPv!9q~2nJmhiv1_xxZHJrLPFM=m6
zrue|3qTERb29)+xVx3dSYcK|=sk6^ss!5&(QBdJ5$mdknMZY9<fyv0R7|80tcL%-y
zkkaAPP_zu|RQvWey&4xU1I5k$*f)%LGRfbI<O`#|-jfubueBxznvCk}i&mY8V%D3a
z)DS8x#-)sXBzV%Dwr9xup_Sm&0oWwfR~dA#k<v3DYcV6(I?Qn8&QZRS6G~~fAtgu@
z29rO)FA(fO-Z!Fx--e@3odiGSef#KgFEPAdX!V?^%b`xh#y@#aHTlOKgwAi~<BL;C
zBYW;XuMeWS6{nV4=KivbA~=s@5}FO(xu++UNZD$UqBLYKI({SMd`4&p2gg5}Sm(+`
z-$qL<8a)n6c*@&wnswZHnk9tRV^;O<%``o+$w8GD`rvxH^0A1075#bP2Ok&O0WbF1
z`mQ_4_3aw{{f~V6(<)xoXT1)v6K78Hw%Hl9B!sxbo-~%<J!z-<s>5U!It%EQ-f1?B
ztkUC)JEailaXqOS12+ffLT=4S!x?i1gg1HtyL$uc&+JOP5mLYefZa$>gwza>QngSd
zgWT)a^Q4yZl=*3y3X+ezh?QN{v#-qhwKrRgN~ZD{q-q056-kD_M)oz}C!x)YYZ@`x
zg0s9AYj8gM&cd?_?xUYwxn!{9c{M)+Qwv7Iy^roYBDyn5wMudwmlGa=tCnWa4Glxi
zdXh>@u8SF{iNT{yQqVjNrbMP-{lM2Z&?}3X459~)TKiC+)H|?pO<b}vzNjYn`gY)E
zsbeCUm1>FM@MIA<Y2}3_5sfhX27M*fMc}AxV>}C2plcCXUq6tDzC_aNR7zS~%2%i$
zmY9G$hHdl7v*_)Jmn{q3;vXOPpu;R-e)nNxm_5(&WX~<PTIU&O*?KCay<TZYG>OIE
z?@&3QFlCyi)HKg`ps_peP!%fKFoOGfsKuFs%64jC1l>OQun}Epn9V@hUbmTYj2dS@
zYQg$tjqIwCO+d{@y#}`sy?2kbzgHxXU!5cK1;DS4N2V;(5j-o#ZR4{<CiK6Yb7dnv
zh!H0ILV{DBWhE=PkH@}!r7jZ1Z2Xv5>m~xCZ6ML4zJn-H$cJoi+^!pliWeJ|VvrbU
z3+%+fHzLS2)Vlu4@Y>RUz{{yKnOQSet30OpYF(oOa<{&Ujh)S4=06Ln_cJSA+Qxhw
z&^}XMUs$8N6RG}QY)?+2LgWQl&<1tSn>2|6(;%&eP=-M4g!WeF<HX7CY4!46BVxe0
zU2R-&($<lBH*9Bx&yRbwf0K$m$;<=ap;A!<+KTZ<r{(V9>uBZvQy<pr48L69!)_zm
z7DE2yaB9(?ggz+o$ruJkBkwaP*w`+*F8ZK1Z@Vh1py_PPV$?q<XWlrJ&?%Q*{)muV
zBe~e=taq+aRBzo@;KsTwfo3F^FYC#S^t4tCI)aU;TNI<E!WVielV=;CkSqfWb#r=z
z{;}Yx?VZ(0)y)P`4z~|<(n8phQ^0xq)=XbxBS)0p(~LzN7-!}(fv+6er0>2lg$&NK
ztPY|12ZCLnBG}Um`M4@#znmVt9bu(iHdCHSRrjx{P3(%DJC098eFqeG3PC1P!F#H`
z%~QVIZ6G!qIVst1pmT-3`n;~(Rzfr^^LbfhEETSFz_TLCvzr6i{rKmWMSYs<Z%D4j
z%#9WD9o{DT<#Xf1sA-1GDN(iKe(*&=_co68y&d?_gU$kTM0hO8RYry}C9zQ{W2$11
z&?FXkf7a9<ryKsnD)K7{NhsY%_ceS)=eV5U@ep96!f<A!xe7}vs}65pxeR}_%7Ts4
z*a?%qBSr2+V1qxGmX_03;DGz`9q84{aBlmj>$RD4v4Hcta|#eE$W@7|Wqw``gSRA(
z93__+)KQb()juX3O-8T6-zK;hqz@C>T-<jhveK%4fgN_ZgJ$1vYp3Qo()%2i&fcDO
zCs#yak_V+kA-QOrHi~+1s>S_n0WAg-H%~*6Um;IiIg90W(9n!V+F0ZB+RR16N%Il;
zVhM~GP~&FV2Ik$2hJ(O-tgphMEb364+BLyi+Sq>Hdn<Y8eC|`EwcNfT!X-?GOG6gI
z0fl|Q2e}u?ftiam?p=PYAGskSsWY?Z!C5`kP3v6>3g<U^E4AnTa~`R|0MyRe;(YKR
zxD<AB>CFI+Uyl1NSr~jS_hj4^6=NxBV_XwnVVG+@-x*^i&P;El=NmBbef2ce%C2~a
z3xGfzvaciL(`11(*@mI8g#H!%eX$5?*A1|cv_s*eDQEBP)SRM>i3H{38JdskN(J(A
zfO2fo7p=mweH9-!B+JkDVp4popO9)cu=Pk4)*?7w;tOqZr{?p&GikrxS-=6G=5TFm
zHbudjzZ$0GUiOf70s(b`dX2=L=*kXqb}H5e(J|IWD>w7ivS+qV4D3m%rMfP{cMLnG
z_9RGd3nFCURBhhbMzpo*i7Mz4`EJwSak&<vL@)6eS1$?(npErff+O!P`3paev^Vd}
zRsgptqpW#DuM@$^KR%maHloMVv%a_<2FzOQ*$JHHehG$b;)%HwGN~+D3PvvpV|GsS
z7#Mf^3U@vdJCa@ZlNkF}g?`~v!o(04lT(qCUrQh#vLmA4BZBwM1!8mqrTRaIji?3A
z=H$@o!7B8N|7R|+HFLAFgpMcdKsLWpLRQkSA{-}v_<0Bfd;goYM?Q6ihdTD+hcP5%
zZaapt4?qTBtq>ZUbeR~Xj#|s(wx9;J-Gy}E3pARByxDj*$gRM6R+rUjVZAb@6)3d_
zTgL$gJ38qlL8IjC@`CXkym{qky?WjOY{3cfY<6}|3zkCz9xB?e)`qEX7?a94c(WBw
zipq|)^u#t<?dzV!%+hMi*DKG2m}ZwqQYFe0*-Fg<H1Y%)EiFXdt?_MMy~aub*KSom
zk24tA-f}}MPkDc2zTMN+Gy@#Or5G!><!4Zi_hLBn44PHh)GP$q-q@p@^pbn~ZzX6=
z8hSsu+i>M(mNW7eHiAbq;upw`y>ke74l$;;y1#6_uWw%AKeNFC2X>1=gZ0mF3OR8p
zbwFDrq2Z+YBb+}=Hh+%7|ES^o9*h5~;DjY~#B_4t%bdgAN%{Dtd<{pJ(&VRZ*4~0M
zznVu}c%68Tf9v<2%<A*ThRf&%U*@%N8L2g963bKzZ1}nbk!{U^-#lx(M6CdL5g&zB
zIMHm9t?dn*ii%=%Z=xOnT5Y&G?JaRvK=)kjOO&!i(akx9XkU*0%UIH}%5r<BBNL>0
zc9jMQ%eudAsGx|3{@vb7e+pqxVf%>u(P)^$lSEU|0{JI>GCz)j%q4cc&vG36G2u&`
zh6az%Q2s3f8Q(6;`k+rgjSB!U{1E{cD3Uy^+%&B`Jbpro{lRZeHgh}BktwpNnyHI*
zpG_akDmCRoBvn#=Iu$|R8Ei70coKk8h(i9FE1e^qi#S*&D;O*ulqB=&9J5PR;_e<}
zC=NXf{e82tfCe!!a280No*u*#RrJKP8w7{fRi?=SOvF+OzUza(j`JY$1)Oehqy|gT
zrceQiWs6|gSO#cn;4v`YjftWoEh2hF+~0RFp{Cmt2kjtrN?Bu+h`S&k9H}FFVW_)c
zouXs9qN5%jdDro-e<2*Eq1=~km4{%9s{~dDu+gxc1`i;g)Fo?)atlug<k4|j?+E1v
zhgOz`r=J9;k$0t0u9;eqvK20+&($d6OvruG%m!8xn-g~eg@HH3&xmh=D@`fI(y4Hx
zq==sdd$w}clpsaJ1FUX?8~oALjIh=GiPiX!D+NP3&}XTmV9Mjn4glruNCQFhNV4cJ
z(GStF^=%OO^O_$eZlO7G#=Rmaq!Qo7_90ooe_`=0dEbA@_q4wLaZYeUen{{%RZ6h7
z#Oq+Rbfk;mueB4rA^IGS*Z23!_w6f<Q{r#ylNR2Pvru7yL*qlnv57HY>ajT_zlX;B
zK#9s)MSjF24}W&i566qni;o~sd?n}O2$d86LI=4r7hVM@7)+scOdMz()6&^O&CS`x
zo!!FO&Far7>;IK6p`m+`ETPoJK^y@IxzAt!R$|x0DYX!sl1+xJgYQgr*+`JdLpxr5
z|E+!r9I?vjyDaQ`l;r4{>Un_BqZ2=X6K#$kv>IPJB`U|hLI14avtS8)1u4Q4@aF<;
zSHBcjWnYVxejbvziqD8SMJyYFa!6Y|UuKWs<gICz)kGJ0Wx2LqTPN_YQ8;1=M6V&d
zT1hv3`TY?wI66v2zJsCYj^`ABO(unboBBRo8vfpcoY?MOn1hx`S^tB|HGj4T`&>xE
z_bJhNd*((b(uSS9@3$xc3!<V}su+)_M`PfaxjLBmKR>gGspAgt0=CV9dv&>Y8v`aj
zqIUax+av69b+t<+knYLRM}58?8^6o?RI(fC78*lKf6QSVcKC@_Npas+&<_G>6I{NI
zCq1$}VCT#Tr$tdP=s|nK_Ac5+oYTkTK6;h(-|#1Bbb|8+ia%^9JhA_ZKQkAX|G^K6
zyFa(A<POln&nZcSE6j-f_$&}(gt(4+(c|Z{H2{U@x>kaO%t|5MB>g#7ugMYjFudj$
zJU%}vtdB2IS<rN*4P2d((^!46Fk2a(9_Njasp9r3c(RQLq*-$c2Cw4{;xg+p?~>y?
zB1LBpuF=#+iHb|ZG0~vCM%AH-0B$MFjFs|G%_V7E&N3G9fSTVi7k;1Ey+$NEniLjW
ztC4Y`OJy)~?nCU=kA?8Ew(eg{4BHbS>&3)kSB|6FDPB%*Z>PNDxc)S4ia-$?vi&L#
zQrM9_gh27uyeuvJ32;zx4n9PTsGGMGWQS&Do?P%nAC1I+DEU&wLC9*ZN^$Hvex>#}
zV`SKL1BL>{LL$dNU|@jA&F$g+mUD*!g}uK3h`e{RFzXBhpN!875e^9@GVF0E;Y5>t
zK6M+6Fge^gI^2HH`$`xWANQdd)u-&O2RYaDj7>CV6#kt1Y*k$YCd^@PogNW>snfwx
z6#N{pa2?WIA|tzyG32nprzU#(iLhm18J*&p$|(J1WY&maIm+El+Qv`u@Q1vBfn|j%
zvwvR(^q=?lpX0wQ3Q|-0yMw<kQ23AG&*NJtN&d22;i2KfN!#D1L(l@~gDKpH#($sC
z`fUmT{D7*6|M&FPLq88^IevShME}1x@sBx=hh835ZGU@t1ua8E@8)3*_o0J_Bk11_
zln8%0_&uI}X!=la|2EZy){vq9?fy`HKlJcWWB&F~0!@N{zKH*y;(X}vp=A5*u$1hV
z!v})xUj^Jlr+@GIf4c+#8Xf@v{}2KX&HtXc|7y-l^%wI$^SGK40u+M)06O$T4}~!T
I?ayET2aAF)PXGV_

literal 0
HcmV?d00001

diff --git a/GroupLine.App/View/AppearanceTest/AppearanceTestIndex.xaml b/GroupLine.App/View/AppearanceTest/AppearanceTestIndex.xaml
new file mode 100644
index 0000000..c15921e
--- /dev/null
+++ b/GroupLine.App/View/AppearanceTest/AppearanceTestIndex.xaml
@@ -0,0 +1,214 @@
+<UserControl
+    x:Class="GroupLine.App.View.AppearanceTest.AppearanceTestIndex"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=AppearanceTest}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="151*" />
+                        <ColumnDefinition Width="1211*" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="1"
+                        Margin="160,0,0,20"
+                        HorizontalAlignment="Left"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="铭板号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入铭板号"
+                                materialDesign:HintAssist.Hint="铭板号"
+                                Text="{Binding SearchPlaqueNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Grid.ColumnSpan="2"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid Grid.Row="1" Height="680">
+            <DataGrid
+                x:Name="dg1"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListAppearanceTestDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PlaqueNo}"
+                        Header="压缩机铭板号" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ProLineNo}"
+                        Header="生产线号" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MachineTypeCheck}"
+                        Header="机种确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PlaqueCheck}"
+                        Header="铭板确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding TerminalCheck}"
+                        Header="端子确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ElectricalBoxCheck}"
+                        Header="电器盒确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding SealingPlugCheck}"
+                        Header="密封塞确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding InOutTubeCheck}"
+                        Header="吸入管吐出管确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding UpperCoverCheck}"
+                        Header="上外罩确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ReservoirCheck}"
+                        Header="储液器确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding HandTubeCheck}"
+                        Header="继手管确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldCheck}"
+                        Header="点焊确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PaintCheck}"
+                        Header="涂装确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding LiftLugCheck}"
+                        Header="吊耳确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding GirthWeldCheck}"
+                        Header="环焊确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldSlagCheck}"
+                        Header="焊渣确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FastenLeatherPadCheck}"
+                        Header="紧固环皮垫确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderCheck}"
+                        Header="筒体确认" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="外观检查结果" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OperationNo}"
+                        Header="测试人员工号" />
+
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/AppearanceTest/AppearanceTestIndex.xaml.cs b/GroupLine.App/View/AppearanceTest/AppearanceTestIndex.xaml.cs
new file mode 100644
index 0000000..a11c103
--- /dev/null
+++ b/GroupLine.App/View/AppearanceTest/AppearanceTestIndex.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace GroupLine.App.View.AppearanceTest
+{
+    /// <summary>
+    /// AppearanceTestIndex.xaml 的交互逻辑
+    /// </summary>
+    public partial class AppearanceTestIndex : UserControl
+    {
+        public AppearanceTestIndex()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/BurPlugInstall/BurPlugInstallView.xaml b/GroupLine.App/View/BurPlugInstall/BurPlugInstallView.xaml
new file mode 100644
index 0000000..a332f4c
--- /dev/null
+++ b/GroupLine.App/View/BurPlugInstall/BurPlugInstallView.xaml
@@ -0,0 +1,154 @@
+<UserControl
+    x:Class="GroupLine.App.View.BurPlugInstall.BurPlugInstallView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.BurPlugInstall"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=BurPlugInstall}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaticDiskNo}"
+                        Header="静盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding SpiralScrewCheck}"
+                        Header="螺旋螺钉判定" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaDycDiskCheck}"
+                        Header="动静盘埋塞判定" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CoverPlugCheck}"
+                        Header="盖板埋塞判定" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/BurPlugInstall/BurPlugInstallView.xaml.cs b/GroupLine.App/View/BurPlugInstall/BurPlugInstallView.xaml.cs
new file mode 100644
index 0000000..f1799f2
--- /dev/null
+++ b/GroupLine.App/View/BurPlugInstall/BurPlugInstallView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.BurPlugInstall
+{
+    /// <summary>
+    /// BurPlugInstallView.xaml 的交互逻辑
+    /// </summary>
+    public partial class BurPlugInstallView : UserControl
+    {
+        public BurPlugInstallView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/CylinderEngrav/CylinderEngravView.xaml b/GroupLine.App/View/CylinderEngrav/CylinderEngravView.xaml
new file mode 100644
index 0000000..c78273c
--- /dev/null
+++ b/GroupLine.App/View/CylinderEngrav/CylinderEngravView.xaml
@@ -0,0 +1,142 @@
+<UserControl
+    x:Class="GroupLine.App.View.CylinderEngrav.CylinderEngravView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.CylinderEngrav"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=CylinderEngrav}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/CylinderEngrav/CylinderEngravView.xaml.cs b/GroupLine.App/View/CylinderEngrav/CylinderEngravView.xaml.cs
new file mode 100644
index 0000000..256264a
--- /dev/null
+++ b/GroupLine.App/View/CylinderEngrav/CylinderEngravView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.CylinderEngrav
+{
+    /// <summary>
+    /// CylinderEngravView.xaml 的交互逻辑
+    /// </summary>
+    public partial class CylinderEngravView : UserControl
+    {
+        public CylinderEngravView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/DbDataClear/DbDataClearView.xaml b/GroupLine.App/View/DbDataClear/DbDataClearView.xaml
new file mode 100644
index 0000000..58145af
--- /dev/null
+++ b/GroupLine.App/View/DbDataClear/DbDataClearView.xaml
@@ -0,0 +1,83 @@
+<UserControl
+    x:Class="YC5.App.View.DbDataClear.DbDataClearView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:YC5.App.View.DbDataClear"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="1000"
+    d:DesignWidth="1600"
+    DataContext="{Binding Source={StaticResource Locator}, Path=DbDataClear}"
+    mc:Ignorable="d">
+    <Grid>
+        <StackPanel>
+            <GroupBox Margin="10,20,10,10" Header="数据清除">
+                <StackPanel Margin="0,10,0,0" Orientation="Vertical">
+                    <StackPanel.Resources>
+                        <Style TargetType="StackPanel">
+                            <Setter Property="Orientation" Value="Horizontal" />
+                            <Setter Property="Margin" Value="0,0,0,4" />
+                        </Style>
+                        <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                            <Setter Property="Width" Value="120" />
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                        <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                            <Setter Property="Padding" Value="0,3" />
+                        </Style>
+                        <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                            <Setter Property="Padding" Value="0,3" />
+                        </Style>
+                    </StackPanel.Resources>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="5*" />
+                            <RowDefinition Height="8*" />
+                            <RowDefinition Height="5*" />
+                        </Grid.RowDefinitions>
+
+                        <StackPanel
+                            Grid.Column="1"
+                            HorizontalAlignment="Center"
+                            Orientation="Horizontal">
+
+                            <StackPanel Margin="20">
+                                <Label HorizontalContentAlignment="Center" Content="时间节点:" />
+                                <DatePicker
+                                    Width="120"
+                                    Margin="0,0,10,0"
+                                    materialDesign:HintAssist.Hint="时间节点"
+                                    Language="zh-CN"
+                                    SelectedDate="{Binding ActionCmdDate, Mode=TwoWay}"
+                                    Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            </StackPanel>
+                        </StackPanel>
+
+
+
+
+                        <Button
+                            Grid.Row="1"
+                            Grid.RowSpan="2"
+                            Grid.Column="1"
+                            Width="100"
+                            Height="30"
+                            Margin="660,0,0,0"
+                            HorizontalAlignment="Left"
+                            Background="Orange"
+                            Command="{Binding ActionCmd}"
+                            Content="提交" />
+
+                    </Grid>
+
+                </StackPanel>
+
+
+            </GroupBox>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/DbDataClear/DbDataClearView.xaml.cs b/GroupLine.App/View/DbDataClear/DbDataClearView.xaml.cs
new file mode 100644
index 0000000..c338b62
--- /dev/null
+++ b/GroupLine.App/View/DbDataClear/DbDataClearView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace YC5.App.View.DbDataClear
+{
+    /// <summary>
+    /// DbDataClearView.xaml 的交互逻辑
+    /// </summary>
+    public partial class DbDataClearView : UserControl
+    {
+        public DbDataClearView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/ExhInstallMes/ExhInstallMesView.xaml b/GroupLine.App/View/ExhInstallMes/ExhInstallMesView.xaml
new file mode 100644
index 0000000..dd60dc9
--- /dev/null
+++ b/GroupLine.App/View/ExhInstallMes/ExhInstallMesView.xaml
@@ -0,0 +1,287 @@
+<UserControl
+    x:Class="GroupLine.App.View.ExhInstallMes.ExhInstallMesView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.ExhInstallMes"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=ExhInstallMes}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MachineCode}"
+                        Header="机型" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaticDiskNo}"
+                        Header="静盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding DynaDiskNo}"
+                        Header="动盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cycle}"
+                        Header="节拍" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ScrewCount}"
+                        Header="螺丝数量" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque}"
+                        Header="排气盖板扭矩1(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle}"
+                        Header="最终角度1(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque2}"
+                        Header="排气盖板扭矩2(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle2}"
+                        Header="最终角度2(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque3}"
+                        Header="排气盖板扭矩3(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle3}"
+                        Header="最终角度3(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque4}"
+                        Header="排气盖板扭矩4(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle4}"
+                        Header="最终角度4(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque5}"
+                        Header="排气盖板扭矩5(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle5}"
+                        Header="最终角度5(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque6}"
+                        Header="排气盖板扭矩6(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle6}"
+                        Header="最终角度6(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque7}"
+                        Header="排气盖板扭矩7(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle7}"
+                        Header="最终角度7(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque8}"
+                        Header="排气盖板扭矩8(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle8}"
+                        Header="最终角度8(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque9}"
+                        Header="排气盖板扭矩9(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle9}"
+                        Header="最终角度9(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque10}"
+                        Header="排气盖板扭矩10(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle10}"
+                        Header="最终角度10(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque11}"
+                        Header="排气盖板扭矩11(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle11}"
+                        Header="最终角度11(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ExhausTorque12}"
+                        Header="排气盖板扭矩12(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle12}"
+                        Header="最终角度12(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/ExhInstallMes/ExhInstallMesView.xaml.cs b/GroupLine.App/View/ExhInstallMes/ExhInstallMesView.xaml.cs
new file mode 100644
index 0000000..11aac6a
--- /dev/null
+++ b/GroupLine.App/View/ExhInstallMes/ExhInstallMesView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.ExhInstallMes
+{
+    /// <summary>
+    /// ExhInstallMesView.xaml 的交互逻辑
+    /// </summary>
+    public partial class ExhInstallMesView : UserControl
+    {
+        public ExhInstallMesView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GCDTransplant/GCDTransplantView.xaml b/GroupLine.App/View/GCDTransplant/GCDTransplantView.xaml
new file mode 100644
index 0000000..b0aa424
--- /dev/null
+++ b/GroupLine.App/View/GCDTransplant/GCDTransplantView.xaml
@@ -0,0 +1,137 @@
+<UserControl
+    x:Class="GroupLine.App.View.GCDTransplant.GCDTransplantView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GCDTransplant"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GCDTransplant}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GCDTransplant/GCDTransplantView.xaml.cs b/GroupLine.App/View/GCDTransplant/GCDTransplantView.xaml.cs
new file mode 100644
index 0000000..2b08303
--- /dev/null
+++ b/GroupLine.App/View/GCDTransplant/GCDTransplantView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GCDTransplant
+{
+    /// <summary>
+    /// GCDTransplantView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GCDTransplantView : UserControl
+    {
+        public GCDTransplantView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml b/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml
new file mode 100644
index 0000000..7e0f9bd
--- /dev/null
+++ b/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml
@@ -0,0 +1,157 @@
+<UserControl
+    x:Class="GroupLine.App.View.GCylinderBurnEb.GCylinderBurnEbView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GCylinderBurnEb"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GCylinderBurnEb}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StatoNo}"
+                        Header="定子编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ATrayNo}"
+                        Header="A托盘号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderTemp}"
+                        Header="筒体温度(℃)" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml.cs b/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml.cs
new file mode 100644
index 0000000..1687f28
--- /dev/null
+++ b/GroupLine.App/View/GCylinderBurnEb/GCylinderBurnEbView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GCylinderBurnEb
+{
+    /// <summary>
+    /// GCylinderBurnEbView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GCylinderBurnEbView : UserControl
+    {
+        public GCylinderBurnEbView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GDynStaticMach/GDynStaticMachView.xaml b/GroupLine.App/View/GDynStaticMach/GDynStaticMachView.xaml
new file mode 100644
index 0000000..21b0c13
--- /dev/null
+++ b/GroupLine.App/View/GDynStaticMach/GDynStaticMachView.xaml
@@ -0,0 +1,167 @@
+<UserControl
+    x:Class="GroupLine.App.View.GDynStaticMach.GDynStaticMachView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GDynStaticMach"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GDynStaticMach}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding DynaDiskNo}"
+                        Header="动盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaticDiskNo}"
+                        Header="静盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding EuropMacine}"
+                        Header="欧式机构" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaDskCastNo}"
+                        Header="静盘铸件号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <!--<DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Torque}"
+                        Header="扭矩值" />-->
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GDynStaticMach/GDynStaticMachView.xaml.cs b/GroupLine.App/View/GDynStaticMach/GDynStaticMachView.xaml.cs
new file mode 100644
index 0000000..563425e
--- /dev/null
+++ b/GroupLine.App/View/GDynStaticMach/GDynStaticMachView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GDynStaticMach
+{
+    /// <summary>
+    /// GDynStaticMachView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GDynStaticMachView : UserControl
+    {
+        public GDynStaticMachView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GInsRotaRes/GInsRotaResView.xaml b/GroupLine.App/View/GInsRotaRes/GInsRotaResView.xaml
new file mode 100644
index 0000000..fcd57a2
--- /dev/null
+++ b/GroupLine.App/View/GInsRotaRes/GInsRotaResView.xaml
@@ -0,0 +1,171 @@
+<UserControl
+    x:Class="GroupLine.App.View.GInsRotaRes.GInsRotaResView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GInsRotaRes"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GInsRotaRes}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding IsolateResults}"
+                        Header="绝缘结果" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ResValue1}"
+                        Header="电阻值1(Ω)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ResValue2}"
+                        Header="电阻值2(Ω)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ResValue3}"
+                        Header="电阻值3(Ω)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding RotaResult}"
+                        Header="回转方向结果" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ResResult}"
+                        Header="阻值结果" />
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GInsRotaRes/GInsRotaResView.xaml.cs b/GroupLine.App/View/GInsRotaRes/GInsRotaResView.xaml.cs
new file mode 100644
index 0000000..0553a54
--- /dev/null
+++ b/GroupLine.App/View/GInsRotaRes/GInsRotaResView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GInsRotaRes
+{
+    /// <summary>
+    /// GInsRotaResView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GInsRotaResView : UserControl
+    {
+        public GInsRotaResView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GLeakCheck/GLeakCheckView.xaml b/GroupLine.App/View/GLeakCheck/GLeakCheckView.xaml
new file mode 100644
index 0000000..f24da6e
--- /dev/null
+++ b/GroupLine.App/View/GLeakCheck/GLeakCheckView.xaml
@@ -0,0 +1,157 @@
+<UserControl
+    x:Class="GroupLine.App.View.GLeakCheck.GLeakCheckView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GLeakCheck"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GLeakCheck}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PumpVacuum}"
+                        Header="抽真空值(Pa)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding KeepVacuum}"
+                        Header="保持真空值(Pa)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PumpVamResult}"
+                        Header="抽真空值判定" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding KeepVamResult}"
+                        Header="保持真空值判定" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GLeakCheck/GLeakCheckView.xaml.cs b/GroupLine.App/View/GLeakCheck/GLeakCheckView.xaml.cs
new file mode 100644
index 0000000..fee3410
--- /dev/null
+++ b/GroupLine.App/View/GLeakCheck/GLeakCheckView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GLeakCheck
+{
+    /// <summary>
+    /// GLeakCheckView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GLeakCheckView : UserControl
+    {
+        public GLeakCheckView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GLowVolStart/GLowVolStartView.xaml b/GroupLine.App/View/GLowVolStart/GLowVolStartView.xaml
new file mode 100644
index 0000000..b2bc635
--- /dev/null
+++ b/GroupLine.App/View/GLowVolStart/GLowVolStartView.xaml
@@ -0,0 +1,162 @@
+<UserControl
+    x:Class="GroupLine.App.View.GLowVolStart.GLowVolStartView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GLowVolStart"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GLowVolStart}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ACur}"
+                        Header="A相电流值(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding BCur}"
+                        Header="B相电流值(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CCur}"
+                        Header="C相电流值(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GLowVolStart/GLowVolStartView.xaml.cs b/GroupLine.App/View/GLowVolStart/GLowVolStartView.xaml.cs
new file mode 100644
index 0000000..96236c5
--- /dev/null
+++ b/GroupLine.App/View/GLowVolStart/GLowVolStartView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GLowVolStart
+{
+    /// <summary>
+    /// GLowVolStartView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GLowVolStartView : UserControl
+    {
+        public GLowVolStartView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GMagTorque/GMagTorqueView.xaml b/GroupLine.App/View/GMagTorque/GMagTorqueView.xaml
new file mode 100644
index 0000000..02ca73f
--- /dev/null
+++ b/GroupLine.App/View/GMagTorque/GMagTorqueView.xaml
@@ -0,0 +1,152 @@
+<UserControl
+    x:Class="GroupLine.App.View.GMagTorque.GMagTorqueView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GMagTorque"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GMagTorque}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MagBeamCount}"
+                        Header="磁束值(mWb)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding TorqueValue}"
+                        Header="扭矩值(CN·m)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="结果" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GMagTorque/GMagTorqueView.xaml.cs b/GroupLine.App/View/GMagTorque/GMagTorqueView.xaml.cs
new file mode 100644
index 0000000..1e899b2
--- /dev/null
+++ b/GroupLine.App/View/GMagTorque/GMagTorqueView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GMagTorque
+{
+    /// <summary>
+    /// GMagTorqueView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GMagTorqueView : UserControl
+    {
+        public GMagTorqueView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GOilPumpInstall/GOilPumpInstallView.xaml b/GroupLine.App/View/GOilPumpInstall/GOilPumpInstallView.xaml
new file mode 100644
index 0000000..6874847
--- /dev/null
+++ b/GroupLine.App/View/GOilPumpInstall/GOilPumpInstallView.xaml
@@ -0,0 +1,167 @@
+<UserControl
+    x:Class="GroupLine.App.View.GOilPumpInstall.GOilPumpInstallView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GOilPumpInstall"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GOilPumpInstall}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OilPumpNo}"
+                        Header="油泵编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OilPmpBruRsult}"
+                        Header="油泵磕伤确认" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding IsReturn}"
+                        Header="是否是返修品" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldSpotUI}"
+                        Header="焊点外观" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="结果" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GOilPumpInstall/GOilPumpInstallView.xaml.cs b/GroupLine.App/View/GOilPumpInstall/GOilPumpInstallView.xaml.cs
new file mode 100644
index 0000000..b19d5d6
--- /dev/null
+++ b/GroupLine.App/View/GOilPumpInstall/GOilPumpInstallView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GOilPumpInstall
+{
+    /// <summary>
+    /// GOilPumpInstallView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GOilPumpInstallView : UserControl
+    {
+        public GOilPumpInstallView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GRingWeldMach/GRingWeldMachView.xaml b/GroupLine.App/View/GRingWeldMach/GRingWeldMachView.xaml
new file mode 100644
index 0000000..2391368
--- /dev/null
+++ b/GroupLine.App/View/GRingWeldMach/GRingWeldMachView.xaml
@@ -0,0 +1,187 @@
+<UserControl
+    x:Class="GroupLine.App.View.GRingWeldMach.GRingWeldMachView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GRingWeldMach"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GRingWeldMach}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol1}"
+                        Header="电压值1(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur1}"
+                        Header="电流值1(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime1}"
+                        Header="焊接时间1(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol2}"
+                        Header="电压值2(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur2}"
+                        Header="电流值2(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime2}"
+                        Header="焊接时间2(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleClean}"
+                        Header="喷嘴清洁" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleReplace}"
+                        Header="喷嘴更换" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Fixture}"
+                        Header="夹具" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定OK/NG" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GRingWeldMach/GRingWeldMachView.xaml.cs b/GroupLine.App/View/GRingWeldMach/GRingWeldMachView.xaml.cs
new file mode 100644
index 0000000..1192fa8
--- /dev/null
+++ b/GroupLine.App/View/GRingWeldMach/GRingWeldMachView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GRingWeldMach
+{
+    /// <summary>
+    /// GRingWeldMachView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GRingWeldMachView : UserControl
+    {
+        public GRingWeldMachView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GRotorBurnEb/GRotorBurnEbView.xaml b/GroupLine.App/View/GRotorBurnEb/GRotorBurnEbView.xaml
new file mode 100644
index 0000000..3748b24
--- /dev/null
+++ b/GroupLine.App/View/GRotorBurnEb/GRotorBurnEbView.xaml
@@ -0,0 +1,147 @@
+<UserControl
+    x:Class="GroupLine.App.View.GRotorBurnEb.GRotorBurnEbView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GRotorBurnEb"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GRotorBurnEb}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding RotorNo}"
+                        Header="转子编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CrankshaftNo}"
+                        Header="曲轴编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GRotorBurnEb/GRotorBurnEbView.xaml.cs b/GroupLine.App/View/GRotorBurnEb/GRotorBurnEbView.xaml.cs
new file mode 100644
index 0000000..a93d3ae
--- /dev/null
+++ b/GroupLine.App/View/GRotorBurnEb/GRotorBurnEbView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GRotorBurnEb
+{
+    /// <summary>
+    /// GRotorBurnEbView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GRotorBurnEbView : UserControl
+    {
+        public GRotorBurnEbView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GRotorMag/GRotorMagView.xaml b/GroupLine.App/View/GRotorMag/GRotorMagView.xaml
new file mode 100644
index 0000000..1243965
--- /dev/null
+++ b/GroupLine.App/View/GRotorMag/GRotorMagView.xaml
@@ -0,0 +1,163 @@
+<UserControl
+    x:Class="GroupLine.App.View.GRotorMag.GRotorMagView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GRotorMag"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GRotorMag}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding RotorNo}"
+                        Header="转子编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MagBeamCount}"
+                        Header="磁束量(mwb-T)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Current}"
+                        Header="电流值(KA)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding RotorAngle}"
+                        Header="转子角度(mm)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding RotorAgleRsult}"
+                        Header="转子角度判定" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GRotorMag/GRotorMagView.xaml.cs b/GroupLine.App/View/GRotorMag/GRotorMagView.xaml.cs
new file mode 100644
index 0000000..43646b3
--- /dev/null
+++ b/GroupLine.App/View/GRotorMag/GRotorMagView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GRotorMag
+{
+    /// <summary>
+    /// GRotorMagView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GRotorMagView : UserControl
+    {
+        public GRotorMagView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GShrinkTub/GShrinkTubView.xaml b/GroupLine.App/View/GShrinkTub/GShrinkTubView.xaml
new file mode 100644
index 0000000..76b49ab
--- /dev/null
+++ b/GroupLine.App/View/GShrinkTub/GShrinkTubView.xaml
@@ -0,0 +1,157 @@
+<UserControl
+    x:Class="GroupLine.App.View.GShrinkTub.GShrinkTubView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GShrinkTub"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GShrinkTub}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalLoad}"
+                        Header="终负荷" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalLocation}"
+                        Header="终位置(mm)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GShrinkTub/GShrinkTubView.xaml.cs b/GroupLine.App/View/GShrinkTub/GShrinkTubView.xaml.cs
new file mode 100644
index 0000000..4665586
--- /dev/null
+++ b/GroupLine.App/View/GShrinkTub/GShrinkTubView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GShrinkTub
+{
+    /// <summary>
+    /// GShrinkTubView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GShrinkTubView : UserControl
+    {
+        public GShrinkTubView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GSpotWeldMach/GSpotWeldMachView.xaml b/GroupLine.App/View/GSpotWeldMach/GSpotWeldMachView.xaml
new file mode 100644
index 0000000..8032b47
--- /dev/null
+++ b/GroupLine.App/View/GSpotWeldMach/GSpotWeldMachView.xaml
@@ -0,0 +1,289 @@
+<UserControl
+    x:Class="GroupLine.App.View.GSpotWeldMach.GSpotWeldMachView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GSpotWeldMach"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GSpotWeldMach}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding VolR1_1}"
+                        Header="电压R1-1(V)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CurR1_1}"
+                        Header="电流R1-1(A)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTimeR1_1}"
+                        Header="焊接时间R1-1(S)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding VolR1_2}"
+                        Header="电压R1-2(V)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CurR1_2}"
+                        Header="电流R1-2(A)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTimeR1_2}"
+                        Header="焊接时间R1-2(S)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding VolR1_3}"
+                        Header="电压R1-3(V)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CurR1_3}"
+                        Header="电流R1-3(A)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTimeR1_3}"
+                        Header="焊接时间R1-3(S)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding VolR1_4}"
+                        Header="电压R1-4(V)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CurR1_4}"
+                        Header="电流R1-4(A)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTimeR1_4}"
+                        Header="焊接时间R1-4(S)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding VolR2_1}"
+                        Header="电压R2-1(V)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CurR2_1}"
+                        Header="电流R2-1(A)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTimeR2_1}"
+                        Header="焊接时间R2-1(S)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding VolR2_2}"
+                        Header="电压R2-2(V)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CurR2_2}"
+                        Header="电流R2-2(A)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTimeR2_2}"
+                        Header="焊接时间R2-2(S)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding VolR2_3}"
+                        Header="电压R2-3(V)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CurR2_3}"
+                        Header="电流R2-3(A)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTimeR2_3}"
+                        Header="焊接时间R2-3(S)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding VolR2_4}"
+                        Header="电压R2-4(V)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CurR2_4}"
+                        Header="电流R2-4(A)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTimeR2_4}"
+                        Header="焊接时间R2-4(S)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleClean}"
+                        Header="喷嘴清洁" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleReplace}"
+                        Header="喷嘴更换" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GSpotWeldMach/GSpotWeldMachView.xaml.cs b/GroupLine.App/View/GSpotWeldMach/GSpotWeldMachView.xaml.cs
new file mode 100644
index 0000000..e9d807f
--- /dev/null
+++ b/GroupLine.App/View/GSpotWeldMach/GSpotWeldMachView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GSpotWeldMach
+{
+    /// <summary>
+    /// GSpotWeldMachView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GSpotWeldMachView : UserControl
+    {
+        public GSpotWeldMachView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/GStaticDiskMach/GStaticDiskMachView.xaml b/GroupLine.App/View/GStaticDiskMach/GStaticDiskMachView.xaml
new file mode 100644
index 0000000..2216d0e
--- /dev/null
+++ b/GroupLine.App/View/GStaticDiskMach/GStaticDiskMachView.xaml
@@ -0,0 +1,295 @@
+<UserControl
+    x:Class="GroupLine.App.View.GStaticDiskMach.GStaticDiskMachView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.GStaticDiskMach"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=GStaticDiskMach}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MachineCode}"
+                        Header="机型" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cycle}"
+                        Header="节拍" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ScrewCount}"
+                        Header="螺丝数量" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque}"
+                        Header="最终扭矩1(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle}"
+                        Header="最终角度1(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque2}"
+                        Header="最终扭矩2(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle2}"
+                        Header="最终角度2(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque3}"
+                        Header="最终扭矩3(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle3}"
+                        Header="最终角度3(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque4}"
+                        Header="最终扭矩4(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle4}"
+                        Header="最终角度4(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque5}"
+                        Header="最终扭矩5(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle5}"
+                        Header="最终角度5(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque6}"
+                        Header="最终扭矩6(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle6}"
+                        Header="最终角度6(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque7}"
+                        Header="最终扭矩7(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle7}"
+                        Header="最终角度7(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque8}"
+                        Header="最终扭矩8(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle8}"
+                        Header="最终角度8(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque9}"
+                        Header="最终扭矩9(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle9}"
+                        Header="最终角度9(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque10}"
+                        Header="最终扭矩10(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle10}"
+                        Header="最终角度10(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque11}"
+                        Header="最终扭矩11(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle11}"
+                        Header="最终角度11(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque12}"
+                        Header="最终扭矩12(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle12}"
+                        Header="最终角度12(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/GStaticDiskMach/GStaticDiskMachView.xaml.cs b/GroupLine.App/View/GStaticDiskMach/GStaticDiskMachView.xaml.cs
new file mode 100644
index 0000000..3914c54
--- /dev/null
+++ b/GroupLine.App/View/GStaticDiskMach/GStaticDiskMachView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.GStaticDiskMach
+{
+    /// <summary>
+    /// GStaticDiskMachView.xaml 的交互逻辑
+    /// </summary>
+    public partial class GStaticDiskMachView : UserControl
+    {
+        public GStaticDiskMachView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPCDTransplant/KPCDTransplantView.xaml b/GroupLine.App/View/KPCDTransplant/KPCDTransplantView.xaml
new file mode 100644
index 0000000..2935385
--- /dev/null
+++ b/GroupLine.App/View/KPCDTransplant/KPCDTransplantView.xaml
@@ -0,0 +1,137 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPCDTransplant.KPCDTransplantView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPCDTransplant"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPCDTransplant}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPCDTransplant/KPCDTransplantView.xaml.cs b/GroupLine.App/View/KPCDTransplant/KPCDTransplantView.xaml.cs
new file mode 100644
index 0000000..a9aa4eb
--- /dev/null
+++ b/GroupLine.App/View/KPCDTransplant/KPCDTransplantView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPCDTransplant
+{
+    /// <summary>
+    /// KPCDTransplantView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPCDTransplantView : UserControl
+    {
+        public KPCDTransplantView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPDynStaticMach/KPDynStaticMachView.xaml b/GroupLine.App/View/KPDynStaticMach/KPDynStaticMachView.xaml
new file mode 100644
index 0000000..80f8bc4
--- /dev/null
+++ b/GroupLine.App/View/KPDynStaticMach/KPDynStaticMachView.xaml
@@ -0,0 +1,189 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPDynStaticMach.KPDynStaticMachView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPDynStaticMach"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPDynStaticMach}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding DynaDiskNo}"
+                        Header="动盘编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaticDiskNo}"
+                        Header="静盘编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding EuropMacine}"
+                        Header="欧式机构" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaDskCastNo}"
+                        Header="静盘铸件号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MeterGap}"
+                        Header="间隙值" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MeterGroup}"
+                        Header="分组" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MeterResult}"
+                        Header="结论" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+                    <!--<DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Torque}"
+                        Header="扭矩值" />-->
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding EuopMaDifValue}"
+                        Header="欧式机构段差值" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPDynStaticMach/KPDynStaticMachView.xaml.cs b/GroupLine.App/View/KPDynStaticMach/KPDynStaticMachView.xaml.cs
new file mode 100644
index 0000000..5a2acf8
--- /dev/null
+++ b/GroupLine.App/View/KPDynStaticMach/KPDynStaticMachView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPDynStaticMach
+{
+    /// <summary>
+    /// KPDynStaticMachView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPDynStaticMachView : UserControl
+    {
+        public KPDynStaticMachView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPLeakCheck/KPLeakCheckView.xaml b/GroupLine.App/View/KPLeakCheck/KPLeakCheckView.xaml
new file mode 100644
index 0000000..319bd20
--- /dev/null
+++ b/GroupLine.App/View/KPLeakCheck/KPLeakCheckView.xaml
@@ -0,0 +1,157 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPLeakCheck.KPLeakCheckView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPLeakCheck"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPLeakCheck}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PumpVacuum}"
+                        Header="抽真空值(Pa)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding KeepVacuum}"
+                        Header="保持真空值(Pa)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PumpVamResult}"
+                        Header="抽真空值判定" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding KeepVamResult}"
+                        Header="保持真空值判定" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPLeakCheck/KPLeakCheckView.xaml.cs b/GroupLine.App/View/KPLeakCheck/KPLeakCheckView.xaml.cs
new file mode 100644
index 0000000..45a4729
--- /dev/null
+++ b/GroupLine.App/View/KPLeakCheck/KPLeakCheckView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPLeakCheck
+{
+    /// <summary>
+    /// KPLeakCheckView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPLeakCheckView : UserControl
+    {
+        public KPLeakCheckView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPLowVolStart/KPLowVolStartView.xaml b/GroupLine.App/View/KPLowVolStart/KPLowVolStartView.xaml
new file mode 100644
index 0000000..e9df28e
--- /dev/null
+++ b/GroupLine.App/View/KPLowVolStart/KPLowVolStartView.xaml
@@ -0,0 +1,162 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPLowVolStart.KPLowVolStartView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPLowVolStart"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPLowVolStart}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ACur}"
+                        Header="A相电流值(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding BCur}"
+                        Header="B相电流值(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CCur}"
+                        Header="C相电流值(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPLowVolStart/KPLowVolStartView.xaml.cs b/GroupLine.App/View/KPLowVolStart/KPLowVolStartView.xaml.cs
new file mode 100644
index 0000000..4b19e04
--- /dev/null
+++ b/GroupLine.App/View/KPLowVolStart/KPLowVolStartView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPLowVolStart
+{
+    /// <summary>
+    /// KPLowVolStartView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPLowVolStartView : UserControl
+    {
+        public KPLowVolStartView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPMagTorque/KPMagTorqueView.xaml b/GroupLine.App/View/KPMagTorque/KPMagTorqueView.xaml
new file mode 100644
index 0000000..013e617
--- /dev/null
+++ b/GroupLine.App/View/KPMagTorque/KPMagTorqueView.xaml
@@ -0,0 +1,152 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPMagTorque.KPMagTorqueView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPMagTorque"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPMagTorque}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MagBeamCount}"
+                        Header="磁束值(mwb-T)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding TorqueValue}"
+                        Header="扭矩值(CN.m)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="结果" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPMagTorque/KPMagTorqueView.xaml.cs b/GroupLine.App/View/KPMagTorque/KPMagTorqueView.xaml.cs
new file mode 100644
index 0000000..c6d5f0a
--- /dev/null
+++ b/GroupLine.App/View/KPMagTorque/KPMagTorqueView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPMagTorque
+{
+    /// <summary>
+    /// KPMagTorqueView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPMagTorqueView : UserControl
+    {
+        public KPMagTorqueView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPOilPumpInstall/KPOilPumpInstallView.xaml b/GroupLine.App/View/KPOilPumpInstall/KPOilPumpInstallView.xaml
new file mode 100644
index 0000000..b6e8be1
--- /dev/null
+++ b/GroupLine.App/View/KPOilPumpInstall/KPOilPumpInstallView.xaml
@@ -0,0 +1,167 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPOilPumpInstall.KPOilPumpInstallView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPOilPumpInstall"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPOilPumpInstall}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OilPumpNo}"
+                        Header="油泵编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OilPmpBruRsult}"
+                        Header="油泵磕伤确认" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding IsReturn}"
+                        Header="是否是返修品" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldSpotUI}"
+                        Header="焊点外观" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="结果" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPOilPumpInstall/KPOilPumpInstallView.xaml.cs b/GroupLine.App/View/KPOilPumpInstall/KPOilPumpInstallView.xaml.cs
new file mode 100644
index 0000000..ddc76d8
--- /dev/null
+++ b/GroupLine.App/View/KPOilPumpInstall/KPOilPumpInstallView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPOilPumpInstall
+{
+    /// <summary>
+    /// KPOilPumpInstallView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPOilPumpInstallView : UserControl
+    {
+        public KPOilPumpInstallView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPRingWeldMach/KPRingWeldMachView.xaml b/GroupLine.App/View/KPRingWeldMach/KPRingWeldMachView.xaml
new file mode 100644
index 0000000..35a2d5d
--- /dev/null
+++ b/GroupLine.App/View/KPRingWeldMach/KPRingWeldMachView.xaml
@@ -0,0 +1,187 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPRingWeldMach.KPRingWeldMachView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPRingWeldMach"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPRingWeldMach}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol1}"
+                        Header="电压值1(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur1}"
+                        Header="电流值1(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime1}"
+                        Header="焊接时间1(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol2}"
+                        Header="电压值2(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur2}"
+                        Header="电流值2(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime2}"
+                        Header="焊接时间2(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleClean}"
+                        Header="喷嘴清洁" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleReplace}"
+                        Header="喷嘴更换" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Fixture}"
+                        Header="夹具" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定OK/NG" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPRingWeldMach/KPRingWeldMachView.xaml.cs b/GroupLine.App/View/KPRingWeldMach/KPRingWeldMachView.xaml.cs
new file mode 100644
index 0000000..c29c717
--- /dev/null
+++ b/GroupLine.App/View/KPRingWeldMach/KPRingWeldMachView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPRingWeldMach
+{
+    /// <summary>
+    /// KPRingWeldMachView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPRingWeldMachView : UserControl
+    {
+        public KPRingWeldMachView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPRingWeldMachDw/KPRingWeldMachDwView.xaml b/GroupLine.App/View/KPRingWeldMachDw/KPRingWeldMachDwView.xaml
new file mode 100644
index 0000000..631b423
--- /dev/null
+++ b/GroupLine.App/View/KPRingWeldMachDw/KPRingWeldMachDwView.xaml
@@ -0,0 +1,187 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPRingWeldMachDw.KPRingWeldMachDwView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPRingWeldMachDw"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPRingWeldMachDw}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol1}"
+                        Header="电压值1(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur1}"
+                        Header="电流值1(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime1}"
+                        Header="焊接时间1(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol2}"
+                        Header="电压值2(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur2}"
+                        Header="电流值2(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime2}"
+                        Header="焊接时间2(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleClean}"
+                        Header="喷嘴清洁" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleReplace}"
+                        Header="喷嘴更换" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Fixture}"
+                        Header="夹具" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定OK/NG" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPRingWeldMachDw/KPRingWeldMachDwView.xaml.cs b/GroupLine.App/View/KPRingWeldMachDw/KPRingWeldMachDwView.xaml.cs
new file mode 100644
index 0000000..cb92276
--- /dev/null
+++ b/GroupLine.App/View/KPRingWeldMachDw/KPRingWeldMachDwView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPRingWeldMachDw
+{
+    /// <summary>
+    /// KPRingWeldMachDwView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPRingWeldMachDwView : UserControl
+    {
+        public KPRingWeldMachDwView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPRingWeldMachUp/KPRingWeldMachUpView.xaml b/GroupLine.App/View/KPRingWeldMachUp/KPRingWeldMachUpView.xaml
new file mode 100644
index 0000000..1b62cde
--- /dev/null
+++ b/GroupLine.App/View/KPRingWeldMachUp/KPRingWeldMachUpView.xaml
@@ -0,0 +1,187 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPRingWeldMachUp.KPRingWeldMachUpView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPRingWeldMachUp"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPRingWeldMachUp}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol1}"
+                        Header="电压值1(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur1}"
+                        Header="电流值1(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime1}"
+                        Header="焊接时间1(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol2}"
+                        Header="电压值2(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur2}"
+                        Header="电流值2(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime2}"
+                        Header="焊接时间2(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleClean}"
+                        Header="喷嘴清洁" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleReplace}"
+                        Header="喷嘴更换" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Fixture}"
+                        Header="夹具" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定OK/NG" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPRingWeldMachUp/KPRingWeldMachUpView.xaml.cs b/GroupLine.App/View/KPRingWeldMachUp/KPRingWeldMachUpView.xaml.cs
new file mode 100644
index 0000000..29bb6ad
--- /dev/null
+++ b/GroupLine.App/View/KPRingWeldMachUp/KPRingWeldMachUpView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPRingWeldMachUp
+{
+    /// <summary>
+    /// KPRingWeldMachUpView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPRingWeldMachUpView : UserControl
+    {
+        public KPRingWeldMachUpView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPSealInstall/KPSealInstallView.xaml b/GroupLine.App/View/KPSealInstall/KPSealInstallView.xaml
new file mode 100644
index 0000000..78761b6
--- /dev/null
+++ b/GroupLine.App/View/KPSealInstall/KPSealInstallView.xaml
@@ -0,0 +1,299 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPSealInstall.KPSealInstallView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPSealInstall"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPSealInstall}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding SealCover}"
+                        Header="密封盖板" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cycle}"
+                        Header="节拍(秒)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ScrewCount}"
+                        Header="螺丝数量(个)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque}"
+                        Header="最终扭矩1(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle}"
+                        Header="最终角度1(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque2}"
+                        Header="最终扭矩2(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle2}"
+                        Header="最终角度2(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque3}"
+                        Header="最终扭矩3(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle3}"
+                        Header="最终角度3(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque4}"
+                        Header="最终扭矩4(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle4}"
+                        Header="最终角度4(deg)" />
+
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque5}"
+                        Header="最终扭矩5(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle5}"
+                        Header="最终角度5(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque6}"
+                        Header="最终扭矩6(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle6}"
+                        Header="最终角度6(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque7}"
+                        Header="最终扭矩7(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle7}"
+                        Header="最终角度7(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque8}"
+                        Header="最终扭矩8(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle8}"
+                        Header="最终角度8(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque9}"
+                        Header="最终扭矩9(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle9}"
+                        Header="最终角度9(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque10}"
+                        Header="最终扭矩10(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle10}"
+                        Header="最终角度10(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque11}"
+                        Header="最终扭矩11(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle11}"
+                        Header="最终角度11(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque12}"
+                        Header="最终扭矩12(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle12}"
+                        Header="最终角度12(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPSealInstall/KPSealInstallView.xaml.cs b/GroupLine.App/View/KPSealInstall/KPSealInstallView.xaml.cs
new file mode 100644
index 0000000..c416930
--- /dev/null
+++ b/GroupLine.App/View/KPSealInstall/KPSealInstallView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPSealInstall
+{
+    /// <summary>
+    /// KPSealInstallView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPSealInstallView : UserControl
+    {
+        public KPSealInstallView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPShrinkTub/KPShrinkTubView.xaml b/GroupLine.App/View/KPShrinkTub/KPShrinkTubView.xaml
new file mode 100644
index 0000000..7e9cbeb
--- /dev/null
+++ b/GroupLine.App/View/KPShrinkTub/KPShrinkTubView.xaml
@@ -0,0 +1,157 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPShrinkTub.KPShrinkTubView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPShrinkTub"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPShrinkTub}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalLoad}"
+                        Header="终负荷" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalLocation}"
+                        Header="终位置(mm)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPShrinkTub/KPShrinkTubView.xaml.cs b/GroupLine.App/View/KPShrinkTub/KPShrinkTubView.xaml.cs
new file mode 100644
index 0000000..4ccd84a
--- /dev/null
+++ b/GroupLine.App/View/KPShrinkTub/KPShrinkTubView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPShrinkTub
+{
+    /// <summary>
+    /// KPShrinkTubView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPShrinkTubView : UserControl
+    {
+        public KPShrinkTubView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPSpotWeldMach/KPSpotWeldMachView.xaml b/GroupLine.App/View/KPSpotWeldMach/KPSpotWeldMachView.xaml
new file mode 100644
index 0000000..24846cb
--- /dev/null
+++ b/GroupLine.App/View/KPSpotWeldMach/KPSpotWeldMachView.xaml
@@ -0,0 +1,237 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPSpotWeldMach.KPSpotWeldMachView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPSpotWeldMach"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPSpotWeldMach}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol1}"
+                        Header="电压1(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur1}"
+                        Header="电流1(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime1}"
+                        Header="焊接时间1(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol2}"
+                        Header="电压2(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur2}"
+                        Header="电流2(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime2}"
+                        Header="焊接时间2(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol3}"
+                        Header="电压3(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur3}"
+                        Header="电流3(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime3}"
+                        Header="焊接时间3(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol4}"
+                        Header="电压4(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur4}"
+                        Header="电流4(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime4}"
+                        Header="焊接时间4(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol5}"
+                        Header="电压5(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur5}"
+                        Header="电流5(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime5}"
+                        Header="焊接时间5(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Vol6}"
+                        Header="电压6(V)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur6}"
+                        Header="电流6(A)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime6}"
+                        Header="焊接时间6(S)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleClean}"
+                        Header="喷嘴清洁" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding NozzleReplace}"
+                        Header="喷嘴更换" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPSpotWeldMach/KPSpotWeldMachView.xaml.cs b/GroupLine.App/View/KPSpotWeldMach/KPSpotWeldMachView.xaml.cs
new file mode 100644
index 0000000..a536b69
--- /dev/null
+++ b/GroupLine.App/View/KPSpotWeldMach/KPSpotWeldMachView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPSpotWeldMach
+{
+    /// <summary>
+    /// KPSpotWeldMachView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPSpotWeldMachView : UserControl
+    {
+        public KPSpotWeldMachView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPStaticDiskMach/KPStaticDiskMachView.xaml b/GroupLine.App/View/KPStaticDiskMach/KPStaticDiskMachView.xaml
new file mode 100644
index 0000000..014e945
--- /dev/null
+++ b/GroupLine.App/View/KPStaticDiskMach/KPStaticDiskMachView.xaml
@@ -0,0 +1,295 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPStaticDiskMach.KPStaticDiskMachView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KPStaticDiskMach"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPStaticDiskMach}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MachineCode}"
+                        Header="机型" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cycle}"
+                        Header="节拍" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ScrewCount}"
+                        Header="螺丝数量" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque}"
+                        Header="最终扭矩1(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle}"
+                        Header="最终角度1(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque2}"
+                        Header="最终扭矩2(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle2}"
+                        Header="最终角度2(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque3}"
+                        Header="最终扭矩3(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle3}"
+                        Header="最终角度3(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque4}"
+                        Header="最终扭矩4(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle4}"
+                        Header="最终角度4(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque5}"
+                        Header="最终扭矩5(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle5}"
+                        Header="最终角度5(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque6}"
+                        Header="最终扭矩6(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle6}"
+                        Header="最终角度6(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque7}"
+                        Header="最终扭矩7(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle7}"
+                        Header="最终角度7(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque8}"
+                        Header="最终扭矩8(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle8}"
+                        Header="最终角度8(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque9}"
+                        Header="最终扭矩9(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle9}"
+                        Header="最终角度9(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque10}"
+                        Header="最终扭矩10(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle10}"
+                        Header="最终角度10(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque11}"
+                        Header="最终扭矩11(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle11}"
+                        Header="最终角度11(deg)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalTorque12}"
+                        Header="最终扭矩12(N.M)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle12}"
+                        Header="最终角度12(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPStaticDiskMach/KPStaticDiskMachView.xaml.cs b/GroupLine.App/View/KPStaticDiskMach/KPStaticDiskMachView.xaml.cs
new file mode 100644
index 0000000..881b657
--- /dev/null
+++ b/GroupLine.App/View/KPStaticDiskMach/KPStaticDiskMachView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPStaticDiskMach
+{
+    /// <summary>
+    /// KPStaticDiskMachView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPStaticDiskMachView : UserControl
+    {
+        public KPStaticDiskMachView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KPUpBurnEb/KPUpBurnEbView.xaml b/GroupLine.App/View/KPUpBurnEb/KPUpBurnEbView.xaml
new file mode 100644
index 0000000..9bdc8b1
--- /dev/null
+++ b/GroupLine.App/View/KPUpBurnEb/KPUpBurnEbView.xaml
@@ -0,0 +1,152 @@
+<UserControl
+    x:Class="GroupLine.App.View.KPUpBurnEb.KPUpBurnEbView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KPUpBurnEb}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="曲轴编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入曲轴编号"
+                                materialDesign:HintAssist.Hint="曲轴编号"
+                                Text="{Binding SearchCrankshaftNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CrankshaftNo}"
+                        Header="曲轴编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ProbeA}"
+                        Header="测头A(mm)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ProbeB}"
+                        Header="测头B(mm)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KPUpBurnEb/KPUpBurnEbView.xaml.cs b/GroupLine.App/View/KPUpBurnEb/KPUpBurnEbView.xaml.cs
new file mode 100644
index 0000000..6c605e1
--- /dev/null
+++ b/GroupLine.App/View/KPUpBurnEb/KPUpBurnEbView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.KPUpBurnEb
+{
+    /// <summary>
+    /// KPUpBurnEbView.xaml 的交互逻辑
+    /// </summary>
+    public partial class KPUpBurnEbView : UserControl
+    {
+        public KPUpBurnEbView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KanBan/KanBanIndex.xaml b/GroupLine.App/View/KanBan/KanBanIndex.xaml
new file mode 100644
index 0000000..a8e06e4
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBanIndex.xaml
@@ -0,0 +1,300 @@
+<UserControl
+    x:Class="GroupLine.App.View.KanBan.KanBanIndex"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+    xmlns:local="clr-namespace:GroupLine.App.View.KanBan"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KanBan}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2*" />
+            <RowDefinition Height="5*" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="5*" />
+            <ColumnDefinition Width="5*" />
+        </Grid.ColumnDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="休息时间-搜索条件">
+            <StackPanel Margin="0,10,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Margin="20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Label
+                            HorizontalAlignment="Center"
+                            HorizontalContentAlignment="Center"
+                            Content="班次:" />
+                        <DockPanel x:Name="Combbox1">
+                            <StackPanel>
+                                <!--<ComboBox Width="200" HorizontalAlignment="Left" ItemsSource="{Binding CombboxList}" SelectedItem="{Binding CombboxItem}" DisplayMemberPath="Text" SelectedValuePath="Key" ></ComboBox>-->
+                                <ComboBox
+                                    Width="120"
+                                    materialDesign:HintAssist.Hint="班次"
+                                    DisplayMemberPath="Text"
+                                    ItemsSource="{Binding ClassNumComboBoxList}"
+                                    SelectedValue="{Binding SearchClassNum}"
+                                    SelectedValuePath="Text" />
+                            </StackPanel>
+                        </DockPanel>
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="OrangeRed"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding CreateFormCmd}"
+                            Content="增加" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding DeleteFormCmd}"
+                            Content="删除" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding UpdateFormCmd}"
+                            Content="修改" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <StackPanel Grid.Row="1" Margin="5">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="500" />
+                </Grid.RowDefinitions>
+                <DataGrid
+                    x:Name="dg1"
+                    Grid.ColumnSpan="2"
+                    AutoGenerateColumns="False"
+                    IsReadOnly="True"
+                    ItemsSource="{Binding ListWorkTimeDto}"
+                    SelectionMode="Single">
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Width="0"
+                            Binding="{Binding ID}"
+                            Header="" />
+                        <DataGridTextColumn
+                            Width="80"
+                            Binding="{Binding ClassNum}"
+                            Header="班次" />
+                        <DataGridTextColumn
+                            Width="80"
+                            Binding="{Binding Index}"
+                            Header="排序" />
+                        <DataGridTextColumn
+                            Width="160"
+                            Binding="{Binding StartTime}"
+                            Header="开始时间" />
+                        <DataGridTextColumn
+                            Width="180"
+                            Binding="{Binding EndTime}"
+                            Header="结束时间" />
+                        <DataGridTextColumn
+                            Width="180"
+                            Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                            Header="创建时间" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Grid>
+        </StackPanel>
+
+
+        <GroupBox
+            Grid.Column="1"
+            Margin="10,10,10,10"
+            Header="计划产量-搜索条件">
+            <StackPanel Margin="0,10,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel Margin="20" HorizontalAlignment="Center">
+                        <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                        <DatePicker
+                            Width="120"
+                            Margin="0,0,10,0"
+                            materialDesign:HintAssist.Hint="开始时间"
+                            Language="zh-CN"
+                            SelectedDate="{Binding SearchStartTime, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        <DatePicker
+                            Width="120"
+                            Margin="10,0,10,0"
+                            materialDesign:HintAssist.Hint="结束时间"
+                            Language="zh-CN"
+                            SelectedDate="{Binding SearchEndTime, Mode=TwoWay}"
+                            Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                    </StackPanel>
+
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="OrangeRed"
+                            Command="{Binding PlanCountSearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding PlanCountCreateFormCmd}"
+                            Content="增加" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding PlanCountDeleteFormCmd}"
+                            Content="删除" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding PlanCountUpdateFormCmd}"
+                            Content="修改" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <StackPanel
+            Grid.Row="1"
+            Grid.Column="1"
+            Margin="5">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="500" />
+                </Grid.RowDefinitions>
+                <DataGrid
+                    x:Name="dg2"
+                    Grid.ColumnSpan="2"
+                    AutoGenerateColumns="False"
+                    IsReadOnly="True"
+                    ItemsSource="{Binding ListPlanCountDto}"
+                    SelectionMode="Single">
+                    <i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding SelectedItemCmd}" CommandParameter="{Binding ElementName=dg2}" />
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Width="0"
+                            Binding="{Binding ID}"
+                            Header="" />
+                        <DataGridTextColumn
+                            Width="180"
+                            Binding="{Binding PlanDate, StringFormat={}{0:yyyy-MM-dd}}"
+                            Header="计划日期" />
+                        <DataGridTextColumn
+                            Width="120"
+                            Binding="{Binding ClassNum}"
+                            Header="班次" />
+                        <!--<DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding AGroup}"
+                            Header="前组" />
+                        <DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding BGroup}"
+                            Header="后组" />-->
+                        <DataGridTextColumn
+                            Width="100"
+                            Binding="{Binding CGroup}"
+                            Header="完成" />
+                        <DataGridTextColumn
+                            Width="180"
+                            Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                            Header="创建时间" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Grid>
+        </StackPanel>
+
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/KanBan/KanBanIndex.xaml.cs b/GroupLine.App/View/KanBan/KanBanIndex.xaml.cs
new file mode 100644
index 0000000..01ac4e0
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBanIndex.xaml.cs
@@ -0,0 +1,55 @@
+using GalaSoft.MvvmLight.Messaging;
+using System;
+using System.Windows.Controls;
+
+namespace GroupLine.App.View.KanBan
+{
+    /// <summary>
+    /// KanBanIndex.xaml 的交互逻辑
+    /// </summary>
+    public partial class KanBanIndex : UserControl
+    {
+        public KanBanIndex()
+        {
+            InitializeComponent();
+            //打开OpenUpdateWindow
+            Messenger.Default.Register<String>(this, "Open_KanBan_WorkTimeCreate_CreateWindow", OpenCreateWindow);
+            Messenger.Default.Register<String>(this, "Open_KanBan_WorkTimeUpdate_UpdateWindow", OpenUpdateWindow);
+
+            Messenger.Default.Register<String>(this, "Open_KanBan_PlanCountCreate_CreateWindow", OpenPlanCountCreateWindow);
+            Messenger.Default.Register<String>(this, "Open_KanBan_PlanCountUpdate_UpdateWindow", OpenPlanCountUpdateWindow);
+        }
+
+        private void OpenPlanCountUpdateWindow(string obj)
+        {
+            KanBan_PlanCountUpdate update = new KanBan_PlanCountUpdate();
+            update.ShowDialog();
+        }
+
+        private void OpenPlanCountCreateWindow(string obj)
+        {
+            KanBan_PlanCountCreate create = new KanBan_PlanCountCreate();
+            create.ShowDialog();
+        }
+
+        /// <summary>
+        /// 打开窗体
+        /// </summary>
+        /// <param name="obj"></param>
+        private void OpenCreateWindow(string obj)
+        {
+            KanBan_Create create = new KanBan_Create();
+            create.ShowDialog();
+        }
+
+        /// <summary>
+        /// 更新窗体
+        /// </summary>
+        /// <param name="obj"></param>
+        private void OpenUpdateWindow(string obj)
+        {
+            KanBan_Update update = new KanBan_Update();
+            update.ShowDialog();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KanBan/KanBan_Create.xaml b/GroupLine.App/View/KanBan/KanBan_Create.xaml
new file mode 100644
index 0000000..6ba504e
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBan_Create.xaml
@@ -0,0 +1,111 @@
+<Window
+    x:Class="GroupLine.App.View.KanBan.KanBan_Create"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KanBan"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="创建时间"
+    Width="600"
+    Height="400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KanBan}"
+    mc:Ignorable="d">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+                <Setter Property="Width" Value="200" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                <Setter Property="Width" Value="120" />
+                <Setter Property="Margin" Value="0,0,20,0" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="HorizontalContentAlignment" Value="Right" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                <Setter Property="Padding" Value="0,3" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                <Setter Property="Padding" Value="0,3" />
+            </Style>
+        </ResourceDictionary>
+
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <materialDesign:ColorZone Height="45" Background="MediumOrchid">
+            <StackPanel Orientation="Horizontal">
+                <Button
+                    Width="100"
+                    Margin="20,0,0,0"
+                    Command="{Binding CreateCmd}"
+                    Style="{StaticResource MaterialDesignRaisedLightButton}"
+                    ToolTip="如果填写数据完成的话，请选择提交">
+                    提交
+                </Button>
+                <Button
+                    Width="100"
+                    Margin="20,0,0,0"
+                    Command="{Binding CancelCmd}"
+                    Style="{StaticResource MaterialDesignRaisedLightButton}"
+                    ToolTip="如果不想提交当前表单数据的话，请选择取消">
+                    取消
+                </Button>
+            </StackPanel>
+
+        </materialDesign:ColorZone>
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            Orientation="Vertical">
+            <StackPanel Margin="20" Orientation="Horizontal">
+                <Label Content="班次:" />
+                <DockPanel x:Name="Combbox">
+                    <StackPanel>
+                        <!--<ComboBox Width="200" HorizontalAlignment="Left" ItemsSource="{Binding CombboxList}" SelectedItem="{Binding CombboxItem}" DisplayMemberPath="Text" SelectedValuePath="Key" ></ComboBox>-->
+                        <ComboBox
+                            Width="120"
+                            materialDesign:HintAssist.Hint="班次"
+                            DisplayMemberPath="Text"
+                            ItemsSource="{Binding ClassNumComboBoxList}"
+                            SelectedValue="{Binding FormWorkTimeDto.ClassNum}"
+                            SelectedValuePath="Text" />
+                    </StackPanel>
+                </DockPanel>
+            </StackPanel>
+            <StackPanel Margin="10" Orientation="Horizontal">
+                <Label Content="排序:" />
+                <TextBox
+                    Width="120"
+                    materialDesign:HintAssist.Hint="比如：A1,B2,C3"
+                    Text="{Binding FormWorkTimeDto.Index, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+            </StackPanel>
+
+            <StackPanel Margin="10" Orientation="Horizontal">
+                <Label Content="开始时间:" />
+                <materialDesign:TimePicker
+                    x:Name="PresetTimePicker1"
+                    Width="120"
+                    Is24Hours="True"
+                    Text="{Binding FormWorkTimeDto.StartTime, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+            </StackPanel>
+
+            <StackPanel Margin="10" Orientation="Horizontal">
+                <Label Content="结束时间:" />
+                <materialDesign:TimePicker
+                    x:Name="PresetTimePicker2"
+                    Width="120"
+                    Is24Hours="True"
+                    Text="{Binding FormWorkTimeDto.EndTime, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/GroupLine.App/View/KanBan/KanBan_Create.xaml.cs b/GroupLine.App/View/KanBan/KanBan_Create.xaml.cs
new file mode 100644
index 0000000..e707231
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBan_Create.xaml.cs
@@ -0,0 +1,28 @@
+using GalaSoft.MvvmLight.Messaging;
+using System;
+using System.Windows;
+
+namespace GroupLine.App.View.KanBan
+{
+    /// <summary>
+    /// KanBan_Create.xaml 的交互逻辑
+    /// </summary>
+    public partial class KanBan_Create : Window
+    {
+        public KanBan_Create()
+        {
+            InitializeComponent();
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            //InitializeComponent();
+
+            //消息标志token：ViewAlert，用于标识只阅读某个或者某些Sender发送的消息，并执行相应的处理，所以Sender那边的token要保持一致
+            //执行方法Action：ShowReceiveInfo，用来执行接收到消息后的后续工作，注意这边是支持泛型能力的，所以传递参数很方便。
+            Messenger.Default.Register<String>(this, "CloseCurrentWindow", CloseCurrentWindow);
+        }
+
+        private void CloseCurrentWindow(string obj)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KanBan/KanBan_PlanCountCreate.xaml b/GroupLine.App/View/KanBan/KanBan_PlanCountCreate.xaml
new file mode 100644
index 0000000..065f1eb
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBan_PlanCountCreate.xaml
@@ -0,0 +1,126 @@
+<Window
+    x:Class="GroupLine.App.View.KanBan.KanBan_PlanCountCreate"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KanBan"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="创建时间"
+    Width="600"
+    Height="400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KanBan}"
+    mc:Ignorable="d">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+                <Setter Property="Width" Value="200" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                <Setter Property="Width" Value="120" />
+                <Setter Property="Margin" Value="0,0,20,0" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="HorizontalContentAlignment" Value="Right" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                <Setter Property="Padding" Value="0,3" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                <Setter Property="Padding" Value="0,3" />
+            </Style>
+        </ResourceDictionary>
+
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <materialDesign:ColorZone Height="45" Background="MediumOrchid">
+            <StackPanel Orientation="Horizontal">
+                <Button
+                    Width="100"
+                    Margin="20,0,0,0"
+                    Command="{Binding PlanCountCreateCmd}"
+                    Style="{StaticResource MaterialDesignRaisedLightButton}"
+                    ToolTip="如果填写数据完成的话，请选择提交">
+                    提交
+                </Button>
+                <Button
+                    Width="100"
+                    Margin="20,0,0,0"
+                    Command="{Binding CancelCmd}"
+                    Style="{StaticResource MaterialDesignRaisedLightButton}"
+                    ToolTip="如果不想提交当前表单数据的话，请选择取消">
+                    取消
+                </Button>
+            </StackPanel>
+
+        </materialDesign:ColorZone>
+        <StackPanel Grid.Row="1" Orientation="Vertical">
+
+            <StackPanel
+                Margin="0,20,0,0"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal">
+                <Label Content="班次:" />
+                <DockPanel x:Name="Combbox">
+                    <StackPanel>
+                        <!--<ComboBox Width="200" HorizontalAlignment="Left" ItemsSource="{Binding CombboxList}" SelectedItem="{Binding CombboxItem}" DisplayMemberPath="Text" SelectedValuePath="Key" ></ComboBox>-->
+                        <ComboBox
+                            Width="200"
+                            materialDesign:HintAssist.Hint="班次"
+                            DisplayMemberPath="Text"
+                            ItemsSource="{Binding ClassNumComboBoxList}"
+                            SelectedValue="{Binding FormPlanCountDto.ClassNum}"
+                            SelectedValuePath="Text" />
+                    </StackPanel>
+                </DockPanel>
+            </StackPanel>
+            <StackPanel
+                Margin="10"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal">
+                <Label Content="计划日期:" />
+                <DatePicker
+                    Width="200"
+                    Margin="0,0,10,0"
+                    materialDesign:HintAssist.Hint="计划日期"
+                    Language="zh-CN"
+                    SelectedDate="{Binding FormPlanCountDto.PlanDate, Mode=TwoWay}"
+                    Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+
+            </StackPanel>
+
+            <!--<StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+                <StackPanel Margin="10" Orientation="Horizontal">
+                    <Label Content="前组:" />
+                    <TextBox materialDesign:HintAssist.Hint="前组" Text="{Binding FormPlanCountDto.AGroup, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                </StackPanel>
+            </StackPanel>
+
+            <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+                <StackPanel Margin="10" Orientation="Horizontal">
+                    <Label Content="后组:" />
+                    <TextBox materialDesign:HintAssist.Hint="后组" Text="{Binding FormPlanCountDto.BGroup, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                </StackPanel>
+            </StackPanel>-->
+
+            <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+                <StackPanel Margin="10" Orientation="Horizontal">
+                    <Label Content="完成:" />
+                    <TextBox materialDesign:HintAssist.Hint="完成" Text="{Binding FormPlanCountDto.CGroup, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+
+
+
+
+    </Grid>
+</Window>
diff --git a/GroupLine.App/View/KanBan/KanBan_PlanCountCreate.xaml.cs b/GroupLine.App/View/KanBan/KanBan_PlanCountCreate.xaml.cs
new file mode 100644
index 0000000..9a27955
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBan_PlanCountCreate.xaml.cs
@@ -0,0 +1,27 @@
+using GalaSoft.MvvmLight.Messaging;
+using System;
+using System.Windows;
+
+namespace GroupLine.App.View.KanBan
+{
+    /// <summary>
+    /// KanBan_PlanCountCreate.xaml 的交互逻辑
+    /// </summary>
+    public partial class KanBan_PlanCountCreate : Window
+    {
+        public KanBan_PlanCountCreate()
+        {
+            InitializeComponent(); WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            //InitializeComponent();
+
+            //消息标志token：ViewAlert，用于标识只阅读某个或者某些Sender发送的消息，并执行相应的处理，所以Sender那边的token要保持一致
+            //执行方法Action：ShowReceiveInfo，用来执行接收到消息后的后续工作，注意这边是支持泛型能力的，所以传递参数很方便。
+            Messenger.Default.Register<String>(this, "CloseCurrentWindow", CloseCurrentWindow);
+        }
+
+        private void CloseCurrentWindow(string obj)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KanBan/KanBan_PlanCountUpdate.xaml b/GroupLine.App/View/KanBan/KanBan_PlanCountUpdate.xaml
new file mode 100644
index 0000000..971868f
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBan_PlanCountUpdate.xaml
@@ -0,0 +1,126 @@
+<Window
+    x:Class="GroupLine.App.View.KanBan.KanBan_PlanCountUpdate"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KanBan"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="创建时间"
+    Width="600"
+    Height="400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KanBan}"
+    mc:Ignorable="d">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+                <Setter Property="Width" Value="200" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                <Setter Property="Width" Value="120" />
+                <Setter Property="Margin" Value="0,0,20,0" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="HorizontalContentAlignment" Value="Right" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                <Setter Property="Padding" Value="0,3" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                <Setter Property="Padding" Value="0,3" />
+            </Style>
+        </ResourceDictionary>
+
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <materialDesign:ColorZone Height="45" Background="MediumOrchid">
+            <StackPanel Orientation="Horizontal">
+                <Button
+                    Width="100"
+                    Margin="20,0,0,0"
+                    Command="{Binding PlanCountUpdateCmd}"
+                    Style="{StaticResource MaterialDesignRaisedLightButton}"
+                    ToolTip="如果填写数据完成的话，请选择提交">
+                    提交
+                </Button>
+                <Button
+                    Width="100"
+                    Margin="20,0,0,0"
+                    Command="{Binding CancelCmd}"
+                    Style="{StaticResource MaterialDesignRaisedLightButton}"
+                    ToolTip="如果不想提交当前表单数据的话，请选择取消">
+                    取消
+                </Button>
+            </StackPanel>
+
+        </materialDesign:ColorZone>
+        <StackPanel Grid.Row="1" Orientation="Vertical">
+
+            <StackPanel
+                Margin="0,20,0,0"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal">
+                <Label Content="班次:" />
+                <DockPanel x:Name="Combbox">
+                    <StackPanel>
+                        <!--<ComboBox Width="200" HorizontalAlignment="Left" ItemsSource="{Binding CombboxList}" SelectedItem="{Binding CombboxItem}" DisplayMemberPath="Text" SelectedValuePath="Key" ></ComboBox>-->
+                        <ComboBox
+                            Width="200"
+                            materialDesign:HintAssist.Hint="班次"
+                            DisplayMemberPath="Text"
+                            ItemsSource="{Binding ClassNumComboBoxList}"
+                            SelectedValue="{Binding DgSelectedPlanCountDto.ClassNum}"
+                            SelectedValuePath="Text" />
+                    </StackPanel>
+                </DockPanel>
+            </StackPanel>
+            <StackPanel
+                Margin="10"
+                HorizontalAlignment="Center"
+                Orientation="Horizontal">
+                <Label Content="计划日期:" />
+                <DatePicker
+                    Width="200"
+                    Margin="0,0,10,0"
+                    materialDesign:HintAssist.Hint="计划日期"
+                    Language="zh-CN"
+                    SelectedDate="{Binding DgSelectedPlanCountDto.PlanDate, Mode=TwoWay}"
+                    Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+
+            </StackPanel>
+
+            <!--<StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+                <StackPanel Margin="10" Orientation="Horizontal">
+                    <Label Content="前组:" />
+                    <TextBox materialDesign:HintAssist.Hint="前组" Text="{Binding DgSelectedPlanCountDto.AGroup, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                </StackPanel>
+            </StackPanel>
+
+            <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+                <StackPanel Margin="10" Orientation="Horizontal">
+                    <Label Content="后组:" />
+                    <TextBox materialDesign:HintAssist.Hint="后组" Text="{Binding DgSelectedPlanCountDto.BGroup, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                </StackPanel>
+            </StackPanel>-->
+
+            <StackPanel HorizontalAlignment="Center" Orientation="Vertical">
+                <StackPanel Margin="10" Orientation="Horizontal">
+                    <Label Content="完成:" />
+                    <TextBox materialDesign:HintAssist.Hint="完成" Text="{Binding DgSelectedPlanCountDto.CGroup, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                </StackPanel>
+            </StackPanel>
+        </StackPanel>
+
+
+
+
+    </Grid>
+</Window>
diff --git a/GroupLine.App/View/KanBan/KanBan_PlanCountUpdate.xaml.cs b/GroupLine.App/View/KanBan/KanBan_PlanCountUpdate.xaml.cs
new file mode 100644
index 0000000..b387ede
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBan_PlanCountUpdate.xaml.cs
@@ -0,0 +1,28 @@
+using GalaSoft.MvvmLight.Messaging;
+using System;
+using System.Windows;
+
+namespace GroupLine.App.View.KanBan
+{
+    /// <summary>
+    /// KanBan_PlanCountUpdate.xaml 的交互逻辑
+    /// </summary>
+    public partial class KanBan_PlanCountUpdate : Window
+    {
+        public KanBan_PlanCountUpdate()
+        {
+            InitializeComponent();
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            //InitializeComponent();
+
+            //消息标志token：ViewAlert，用于标识只阅读某个或者某些Sender发送的消息，并执行相应的处理，所以Sender那边的token要保持一致
+            //执行方法Action：ShowReceiveInfo，用来执行接收到消息后的后续工作，注意这边是支持泛型能力的，所以传递参数很方便。
+            Messenger.Default.Register<String>(this, "CloseCurrentWindow", CloseCurrentWindow);
+        }
+
+        private void CloseCurrentWindow(string obj)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/GroupLine.App/View/KanBan/KanBan_Update.xaml b/GroupLine.App/View/KanBan/KanBan_Update.xaml
new file mode 100644
index 0000000..6e4b869
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBan_Update.xaml
@@ -0,0 +1,110 @@
+<Window
+    x:Class="GroupLine.App.View.KanBan.KanBan_Update"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.KanBan"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="创建时间"
+    Width="600"
+    Height="400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=KanBan}"
+    mc:Ignorable="d">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.TextBlock.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.ToggleButton.xaml" />
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Button.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="TextBox">
+                <Setter Property="Width" Value="200" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                <Setter Property="Width" Value="120" />
+                <Setter Property="Margin" Value="0,0,20,0" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="HorizontalContentAlignment" Value="Right" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                <Setter Property="Padding" Value="0,3" />
+            </Style>
+            <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                <Setter Property="Padding" Value="0,3" />
+            </Style>
+        </ResourceDictionary>
+
+    </Window.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+        </Grid.RowDefinitions>
+        <materialDesign:ColorZone Height="45" Background="MediumOrchid">
+            <StackPanel Orientation="Horizontal">
+                <Button
+                    Width="100"
+                    Margin="20,0,0,0"
+                    Command="{Binding UpdateCmd}"
+                    Style="{StaticResource MaterialDesignRaisedLightButton}"
+                    ToolTip="如果填写数据完成的话，请选择提交">
+                    提交
+                </Button>
+                <Button
+                    Width="100"
+                    Margin="20,0,0,0"
+                    Command="{Binding CancelCmd}"
+                    Style="{StaticResource MaterialDesignRaisedLightButton}"
+                    ToolTip="如果不想提交当前表单数据的话，请选择取消">
+                    取消
+                </Button>
+            </StackPanel>
+
+        </materialDesign:ColorZone>
+        <StackPanel
+            Grid.Row="1"
+            HorizontalAlignment="Center"
+            Orientation="Vertical">
+            <StackPanel Margin="20" Orientation="Horizontal">
+                <Label Content="班次:" />
+                <DockPanel x:Name="Combbox">
+                    <StackPanel>
+                        <!--<ComboBox Width="200" HorizontalAlignment="Left" ItemsSource="{Binding CombboxList}" SelectedItem="{Binding CombboxItem}" DisplayMemberPath="Text" SelectedValuePath="Key" ></ComboBox>-->
+                        <ComboBox
+                            Width="120"
+                            materialDesign:HintAssist.Hint="班次"
+                            DisplayMemberPath="Text"
+                            ItemsSource="{Binding ClassNumComboBoxList}"
+                            SelectedValue="{Binding DgSelectedWorkTimeDto.ClassNum}"
+                            SelectedValuePath="Text" />
+                    </StackPanel>
+                </DockPanel>
+            </StackPanel>
+            <StackPanel Margin="10" Orientation="Horizontal">
+                <Label Content="排序:" />
+                <TextBox
+                    Width="120"
+                    materialDesign:HintAssist.Hint="比如：A1,B2,C3"
+                    Text="{Binding DgSelectedWorkTimeDto.Index, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+            </StackPanel>
+            <StackPanel Margin="10" Orientation="Horizontal">
+                <Label Content="开始时间:" />
+                <materialDesign:TimePicker
+                    x:Name="PresetTimePicker1"
+                    Width="120"
+                    Is24Hours="True"
+                    Text="{Binding DgSelectedWorkTimeDto.StartTime, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+            </StackPanel>
+
+            <StackPanel Margin="10" Orientation="Horizontal">
+                <Label Content="结束时间:" />
+                <materialDesign:TimePicker
+                    x:Name="PresetTimePicker2"
+                    Width="120"
+                    Is24Hours="True"
+                    Text="{Binding DgSelectedWorkTimeDto.EndTime, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+            </StackPanel>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/GroupLine.App/View/KanBan/KanBan_Update.xaml.cs b/GroupLine.App/View/KanBan/KanBan_Update.xaml.cs
new file mode 100644
index 0000000..fcfdbb3
--- /dev/null
+++ b/GroupLine.App/View/KanBan/KanBan_Update.xaml.cs
@@ -0,0 +1,28 @@
+using GalaSoft.MvvmLight.Messaging;
+using System;
+using System.Windows;
+
+namespace GroupLine.App.View.KanBan
+{
+    /// <summary>
+    /// KanBan_Update.xaml 的交互逻辑
+    /// </summary>
+    public partial class KanBan_Update : Window
+    {
+        public KanBan_Update()
+        {
+            InitializeComponent();
+            WindowStartupLocation = WindowStartupLocation.CenterScreen;
+            //InitializeComponent();
+
+            //消息标志token：ViewAlert，用于标识只阅读某个或者某些Sender发送的消息，并执行相应的处理，所以Sender那边的token要保持一致
+            //执行方法Action：ShowReceiveInfo，用来执行接收到消息后的后续工作，注意这边是支持泛型能力的，所以传递参数很方便。
+            Messenger.Default.Register<String>(this, "CloseCurrentWindow", CloseCurrentWindow);
+        }
+
+        private void CloseCurrentWindow(string obj)
+        {
+            this.Close();
+        }
+    }
+}
diff --git a/GroupLine.App/View/MagTorque/MagTorqueView.xaml b/GroupLine.App/View/MagTorque/MagTorqueView.xaml
new file mode 100644
index 0000000..8187326
--- /dev/null
+++ b/GroupLine.App/View/MagTorque/MagTorqueView.xaml
@@ -0,0 +1,145 @@
+<UserControl
+    x:Class="GroupLine.App.View.MagTorque.MagTorqueView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.MagTorque"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=MagTorque}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MagValue}"
+                        Header="磁束值" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding TorqueValue}"
+                        Header="扭矩值" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="结果" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/MagTorque/MagTorqueView.xaml.cs b/GroupLine.App/View/MagTorque/MagTorqueView.xaml.cs
new file mode 100644
index 0000000..cc1e94d
--- /dev/null
+++ b/GroupLine.App/View/MagTorque/MagTorqueView.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace GroupLine.App.View.MagTorque
+{
+    /// <summary>
+    /// MagTorqueView.xaml 的交互逻辑
+    /// </summary>
+    public partial class MagTorqueView : UserControl
+    {
+        public MagTorqueView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/MsgInput.xaml b/GroupLine.App/View/MsgInput.xaml
new file mode 100644
index 0000000..b48602a
--- /dev/null
+++ b/GroupLine.App/View/MsgInput.xaml
@@ -0,0 +1,38 @@
+<Window
+    x:Class="GroupLine.App.View.MsgInput"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="输入信息"
+    Width="400"
+    Height="200"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="1*" />
+            <RowDefinition Height="2*" />
+        </Grid.RowDefinitions>
+        <StackPanel
+            Margin="10"
+            HorizontalAlignment="Center"
+            Orientation="Horizontal">
+            <Label Height="30">请输入数据</Label>
+            <TextBox
+                x:Name="Box"
+                Width="100"
+                Height="30"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                FontSize="18"
+                TextAlignment="Center" />
+        </StackPanel>
+        <Button
+            x:Name="ButtonCmd"
+            Grid.Row="1"
+            Margin="30"
+            Click="ButtonCmd_Click"
+            Content="确定" />
+    </Grid>
+</Window>
diff --git a/GroupLine.App/View/MsgInput.xaml.cs b/GroupLine.App/View/MsgInput.xaml.cs
new file mode 100644
index 0000000..f665943
--- /dev/null
+++ b/GroupLine.App/View/MsgInput.xaml.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Windows;
+
+namespace GroupLine.App.View
+{
+    /// <summary>
+    /// MsgInput.xaml 的交互逻辑
+    /// </summary>
+    public partial class MsgInput : Window
+    {
+        public MsgInput()
+        {
+            InitializeComponent();
+        }
+
+        public string InputValue
+        {
+            get
+            {
+                return Box.Text;
+            }
+            set
+            {
+                this.Box.Text = value;
+            }
+        }
+
+        public event EventHandler Accept;
+
+        private void ButtonCmd_Click(object sender, RoutedEventArgs e)
+        {
+            if (Accept != null)
+            {
+                Accept(this, EventArgs.Empty);
+                this.Close();
+            }
+        }
+
+    }
+}
diff --git a/GroupLine.App/View/OffsetConfig/OffsetConfigIndex.xaml b/GroupLine.App/View/OffsetConfig/OffsetConfigIndex.xaml
new file mode 100644
index 0000000..c3c450f
--- /dev/null
+++ b/GroupLine.App/View/OffsetConfig/OffsetConfigIndex.xaml
@@ -0,0 +1,79 @@
+<UserControl
+    x:Class="GroupLine.App.View.OffsetConfig.OffsetConfigIndex"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.OffsetConfig"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=OffsetConfig}"
+    mc:Ignorable="d">
+    <Grid>
+        <GroupBox Margin="10,10,10,10" Header="偏移设置">
+            <StackPanel
+                Grid.Row="2"
+                Grid.Column="0"
+                Grid.ColumnSpan="2"
+                Orientation="Vertical">
+                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                    <StackPanel
+                        Margin="80,20,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Label
+                            Margin="0,0,10,0"
+                            Content="前组产量偏移:"
+                            FontSize="30" />
+                        <TextBox
+                            materialDesign:HintAssist.Hint="输入产量"
+                            FontSize="22"
+                            Text="{Binding AGroupOffsetCount, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                    </StackPanel>
+                    <StackPanel
+                        Margin="80,20,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Label
+                            Margin="0,0,10,0"
+                            Content="后组产量偏移:"
+                            FontSize="30" />
+                        <TextBox
+                            materialDesign:HintAssist.Hint="输入产量"
+                            FontSize="22"
+                            Text="{Binding BGroupOffsetCount, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                    </StackPanel>
+                    <StackPanel
+                        Margin="80,20,0,0"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <Label
+                            Margin="0,0,10,0"
+                            Content="完成产量偏移:"
+                            FontSize="30" />
+                        <TextBox
+                            materialDesign:HintAssist.Hint="输入产量"
+                            FontSize="22"
+                            Text="{Binding CGroupOffsetCount, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                    </StackPanel>
+                </StackPanel>
+
+                <StackPanel>
+                    <Button
+                        Width="120"
+                        Height="30"
+                        Margin="110,20,10,10"
+                        HorizontalAlignment="Center"
+                        Background="Green"
+                        Command="{Binding OffsetCmd}"
+                        Content="确认" />
+                </StackPanel>
+            </StackPanel>
+        </GroupBox>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/OffsetConfig/OffsetConfigIndex.xaml.cs b/GroupLine.App/View/OffsetConfig/OffsetConfigIndex.xaml.cs
new file mode 100644
index 0000000..8677e7d
--- /dev/null
+++ b/GroupLine.App/View/OffsetConfig/OffsetConfigIndex.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace GroupLine.App.View.OffsetConfig
+{
+    /// <summary>
+    /// OffsetConfigIndex.xaml 的交互逻辑
+    /// </summary>
+    public partial class OffsetConfigIndex : UserControl
+    {
+        public OffsetConfigIndex()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/OilPumpInstall/OilPumpInstallView.xaml b/GroupLine.App/View/OilPumpInstall/OilPumpInstallView.xaml
new file mode 100644
index 0000000..573fb82
--- /dev/null
+++ b/GroupLine.App/View/OilPumpInstall/OilPumpInstallView.xaml
@@ -0,0 +1,158 @@
+<UserControl
+    x:Class="YC5.App.View.OilPumpInstall.OilPumpInstallView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:YC5.App.View.OilPumpInstall"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=OilPumpInstall}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                        <i:EventTrigger EventName="SelectionChanged">
+                            <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                        </i:EventTrigger>
+                    </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OilPumpNo}"
+                        Header="油泵编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OilPumpDmge}"
+                        Header="油泵磕伤确认" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Repair}"
+                        Header="是否是返修品" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="结果" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/OilPumpInstall/OilPumpInstallView.xaml.cs b/GroupLine.App/View/OilPumpInstall/OilPumpInstallView.xaml.cs
new file mode 100644
index 0000000..f6120de
--- /dev/null
+++ b/GroupLine.App/View/OilPumpInstall/OilPumpInstallView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace YC5.App.View.OilPumpInstall
+{
+    /// <summary>
+    /// OilPumpInstallView.xaml 的交互逻辑
+    /// </summary>
+    public partial class OilPumpInstallView : UserControl
+    {
+        public OilPumpInstallView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/OverflowLeakMes/OverflowLeakMesView.xaml b/GroupLine.App/View/OverflowLeakMes/OverflowLeakMesView.xaml
new file mode 100644
index 0000000..bf652f5
--- /dev/null
+++ b/GroupLine.App/View/OverflowLeakMes/OverflowLeakMesView.xaml
@@ -0,0 +1,204 @@
+<UserControl
+    x:Class="GroupLine.App.View.OverflowLeakMes.OverflowLeakMesView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.OverflowLeakMes"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=OverflowLeakMes}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MachineCode}"
+                        Header="机型" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaticDiskNo}"
+                        Header="静盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding DynaDiskNo}"
+                        Header="动盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cycle}"
+                        Header="节拍" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ScrewCount}"
+                        Header="螺丝数量" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OverflowTorque}"
+                        Header="溢流阀扭矩(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle}"
+                        Header="最终角度(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OverflowTorque2}"
+                        Header="溢流阀扭矩2(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle2}"
+                        Header="最终角度2(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OverflowTorque3}"
+                        Header="溢流阀扭矩3(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle3}"
+                        Header="最终角度3(deg)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OverflowTorque4}"
+                        Header="溢流阀扭矩4(N.M)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FinalAngle4}"
+                        Header="最终角度4(deg)" />
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Result}"
+                        Header="判定" />
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/OverflowLeakMes/OverflowLeakMesView.xaml.cs b/GroupLine.App/View/OverflowLeakMes/OverflowLeakMesView.xaml.cs
new file mode 100644
index 0000000..4ea9352
--- /dev/null
+++ b/GroupLine.App/View/OverflowLeakMes/OverflowLeakMesView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.OverflowLeakMes
+{
+    /// <summary>
+    /// OverflowLeakMesView.xaml 的交互逻辑
+    /// </summary>
+    public partial class OverflowLeakMesView : UserControl
+    {
+        public OverflowLeakMesView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/PCoreMes/PCoreMesView.xaml b/GroupLine.App/View/PCoreMes/PCoreMesView.xaml
new file mode 100644
index 0000000..407542c
--- /dev/null
+++ b/GroupLine.App/View/PCoreMes/PCoreMesView.xaml
@@ -0,0 +1,146 @@
+<UserControl
+    x:Class="GroupLine.App.View.PCoreMes.PCoreMesView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.PCoreMes"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=PCoreMes}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CoreOutput}"
+                        Header="芯出测量值(Z)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/PCoreMes/PCoreMesView.xaml.cs b/GroupLine.App/View/PCoreMes/PCoreMesView.xaml.cs
new file mode 100644
index 0000000..0096289
--- /dev/null
+++ b/GroupLine.App/View/PCoreMes/PCoreMesView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.PCoreMes
+{
+    /// <summary>
+    /// PCoreMesView.xaml 的交互逻辑
+    /// </summary>
+    public partial class PCoreMesView : UserControl
+    {
+        public PCoreMesView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/PLowWeld/PLowWeldView.xaml b/GroupLine.App/View/PLowWeld/PLowWeldView.xaml
new file mode 100644
index 0000000..a754f87
--- /dev/null
+++ b/GroupLine.App/View/PLowWeld/PLowWeldView.xaml
@@ -0,0 +1,176 @@
+<UserControl
+    x:Class="GroupLine.App.View.PLowWeld.PLowWeldView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.PLowWeld"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=PLowWeld}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CrankshaftNo}"
+                        Header="曲轴编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding DownNo}"
+                        Header="下部编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding DoCastNo}"
+                        Header="下部铸件编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StatorPressDep}"
+                        Header="定子压入深度(mm)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding RotorPressDep}"
+                        Header="转子压入深度(mm)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding FelerGgeResult}"
+                        Header="塞尺检查（OK）" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MagnetResult}"
+                        Header="磁石检查（OK)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/PLowWeld/PLowWeldView.xaml.cs b/GroupLine.App/View/PLowWeld/PLowWeldView.xaml.cs
new file mode 100644
index 0000000..89b1f57
--- /dev/null
+++ b/GroupLine.App/View/PLowWeld/PLowWeldView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.PLowWeld
+{
+    /// <summary>
+    /// PLowWeldView.xaml 的交互逻辑
+    /// </summary>
+    public partial class PLowWeldView : UserControl
+    {
+        public PLowWeldView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/PRacktPress/PRacktPressView.xaml b/GroupLine.App/View/PRacktPress/PRacktPressView.xaml
new file mode 100644
index 0000000..cd4b304
--- /dev/null
+++ b/GroupLine.App/View/PRacktPress/PRacktPressView.xaml
@@ -0,0 +1,156 @@
+<UserControl
+    x:Class="GroupLine.App.View.PRacktPress.PRacktPressView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.PRacktPress"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=PRacktPress}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding RacktNo}"
+                        Header="支架编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PressValue}"
+                        Header="压入压力(N)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding TrayNo}"
+                        Header="托盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/PRacktPress/PRacktPressView.xaml.cs b/GroupLine.App/View/PRacktPress/PRacktPressView.xaml.cs
new file mode 100644
index 0000000..975d7d0
--- /dev/null
+++ b/GroupLine.App/View/PRacktPress/PRacktPressView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.PRacktPress
+{
+    /// <summary>
+    /// PRacktPressView.xaml 的交互逻辑
+    /// </summary>
+    public partial class PRacktPressView : UserControl
+    {
+        public PRacktPressView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/PRacktWeld/PRacktWeldView.xaml b/GroupLine.App/View/PRacktWeld/PRacktWeldView.xaml
new file mode 100644
index 0000000..132075a
--- /dev/null
+++ b/GroupLine.App/View/PRacktWeld/PRacktWeldView.xaml
@@ -0,0 +1,146 @@
+<UserControl
+    x:Class="GroupLine.App.View.PRacktWeld.PRacktWeldView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.PRacktWeld"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=PRacktWeld}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding CylinderNo}"
+                        Header="筒体编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding TrayNo}"
+                        Header="托盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/PRacktWeld/PRacktWeldView.xaml.cs b/GroupLine.App/View/PRacktWeld/PRacktWeldView.xaml.cs
new file mode 100644
index 0000000..0bb1e7a
--- /dev/null
+++ b/GroupLine.App/View/PRacktWeld/PRacktWeldView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.PRacktWeld
+{
+    /// <summary>
+    /// PRacktWeldView.xaml 的交互逻辑
+    /// </summary>
+    public partial class PRacktWeldView : UserControl
+    {
+        public PRacktWeldView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/ReportTimeConfig/ReportTimeConfigIndex.xaml b/GroupLine.App/View/ReportTimeConfig/ReportTimeConfigIndex.xaml
new file mode 100644
index 0000000..dcf5ab2
--- /dev/null
+++ b/GroupLine.App/View/ReportTimeConfig/ReportTimeConfigIndex.xaml
@@ -0,0 +1,81 @@
+<UserControl
+    x:Class="GroupLine.App.View.ReportTimeConfig.ReportTimeConfigIndex"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.ReportTimeConfig"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=ReportTimeConfig}"
+    mc:Ignorable="d">
+    <Grid>
+        <StackPanel>
+            <GroupBox Margin="10,20,10,10" Header="报表自动导出时间设置">
+                <StackPanel Margin="0,10,0,0" Orientation="Vertical">
+                    <StackPanel.Resources>
+                        <Style TargetType="StackPanel">
+                            <Setter Property="Orientation" Value="Horizontal" />
+                            <Setter Property="Margin" Value="0,0,0,4" />
+                        </Style>
+                        <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                            <Setter Property="Width" Value="120" />
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                        <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                            <Setter Property="Padding" Value="0,3" />
+                        </Style>
+                        <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                            <Setter Property="Padding" Value="0,3" />
+                        </Style>
+                    </StackPanel.Resources>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="5*" />
+                            <RowDefinition Height="8*" />
+                            <RowDefinition Height="5*" />
+                        </Grid.RowDefinitions>
+
+                        <StackPanel
+                            Margin="0,0,0,20"
+                            HorizontalAlignment="Center"
+                            Orientation="Horizontal">
+                            <StackPanel Margin="10" Orientation="Horizontal">
+                                <Label Content="每日报表导出时间:" />
+                                <materialDesign:TimePicker
+                                    x:Name="PresetTimePicker1"
+                                    Width="120"
+                                    Is24Hours="True"
+                                    Text="{Binding DayReportTime, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                            </StackPanel>
+
+
+                        </StackPanel>
+
+
+
+
+                        <Button
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Width="100"
+                            Height="30"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding SaveCmd}"
+                            Content="保存" />
+
+                    </Grid>
+
+                </StackPanel>
+
+
+            </GroupBox>
+        </StackPanel>
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/ReportTimeConfig/ReportTimeConfigIndex.xaml.cs b/GroupLine.App/View/ReportTimeConfig/ReportTimeConfigIndex.xaml.cs
new file mode 100644
index 0000000..3a05511
--- /dev/null
+++ b/GroupLine.App/View/ReportTimeConfig/ReportTimeConfigIndex.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace GroupLine.App.View.ReportTimeConfig
+{
+    /// <summary>
+    /// ReportTimeConfigIndex.xaml 的交互逻辑
+    /// </summary>
+    public partial class ReportTimeConfigIndex : UserControl
+    {
+        public ReportTimeConfigIndex()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/StaticDiscPress/StaticDiscPressView.xaml b/GroupLine.App/View/StaticDiscPress/StaticDiscPressView.xaml
new file mode 100644
index 0000000..2d2c757
--- /dev/null
+++ b/GroupLine.App/View/StaticDiscPress/StaticDiscPressView.xaml
@@ -0,0 +1,156 @@
+<UserControl
+    x:Class="GroupLine.App.View.StaticDiscPress.StaticDiscPressView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.StaticDiscPress"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=StaticDiscPress}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding StaticDiskNo}"
+                        Header="静盘编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PressValue}"
+                        Header="压力值(KN)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PressDepth}"
+                        Header="压入深度(mm)" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding PressStation}"
+                        Header="压入工位" />
+
+
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/StaticDiscPress/StaticDiscPressView.xaml.cs b/GroupLine.App/View/StaticDiscPress/StaticDiscPressView.xaml.cs
new file mode 100644
index 0000000..6c87c6f
--- /dev/null
+++ b/GroupLine.App/View/StaticDiscPress/StaticDiscPressView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.StaticDiscPress
+{
+    /// <summary>
+    /// StaticDiscPressView.xaml 的交互逻辑
+    /// </summary>
+    public partial class StaticDiscPressView : UserControl
+    {
+        public StaticDiscPressView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/TermWeld/TermWeldView.xaml b/GroupLine.App/View/TermWeld/TermWeldView.xaml
new file mode 100644
index 0000000..69331c0
--- /dev/null
+++ b/GroupLine.App/View/TermWeld/TermWeldView.xaml
@@ -0,0 +1,162 @@
+<UserControl
+    x:Class="GroupLine.App.View.TermWeld.TermWeldView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View.TermWeld"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="990"
+    d:DesignWidth="1400"
+    DataContext="{Binding Source={StaticResource Locator}, Path=TermWeld}"
+    mc:Ignorable="d">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2.4*" />
+            <RowDefinition Height="7*" />
+        </Grid.RowDefinitions>
+        <GroupBox Margin="10,10,10,10" Header="{Binding MachineName}">
+            <StackPanel Margin="0,0,0,0" Orientation="Vertical">
+                <StackPanel.Resources>
+                    <Style TargetType="StackPanel">
+                        <Setter Property="Orientation" Value="Horizontal" />
+                        <Setter Property="Margin" Value="0,0,0,4" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type Label}}" TargetType="Label">
+                        <Setter Property="Width" Value="120" />
+                        <Setter Property="VerticalAlignment" Value="Center" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type CheckBox}}" TargetType="CheckBox">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                    <Style BasedOn="{StaticResource {x:Type RadioButton}}" TargetType="RadioButton">
+                        <Setter Property="Padding" Value="0,3" />
+                    </Style>
+                </StackPanel.Resources>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="9*" />
+                        <RowDefinition Height="3*" />
+                    </Grid.RowDefinitions>
+
+                    <StackPanel
+                        Grid.Column="0"
+                        Margin="0,0,0,20"
+                        HorizontalAlignment="Center"
+                        Orientation="Horizontal">
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="筒体编号:" />
+                            <TextBox
+                                Width="150"
+                                VerticalAlignment="Center"
+                                materialDesign:HintAssist.HelperText="请输入筒体编号"
+                                materialDesign:HintAssist.Hint="筒体编号"
+                                Text="{Binding SearchCylinderNo, UpdateSourceTrigger=PropertyChanged, ValidatesOnDataErrors=True}" />
+                        </StackPanel>
+                        <StackPanel Margin="20">
+                            <Label HorizontalContentAlignment="Center" Content="创建时间:" />
+                            <DatePicker
+                                Width="120"
+                                Margin="0,0,10,0"
+                                materialDesign:HintAssist.Hint="开始时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchStartDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                            <DatePicker
+                                Width="120"
+                                Margin="10,0,10,0"
+                                materialDesign:HintAssist.Hint="结束时间"
+                                Language="zh-CN"
+                                SelectedDate="{Binding SearchEndDate, Mode=TwoWay}"
+                                Style="{StaticResource MaterialDesignFloatingHintDatePicker}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                    <StackPanel
+                        Grid.Row="1"
+                        Background="  AliceBlue"
+                        Orientation="Horizontal">
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Green"
+                            Command="{Binding SearchCmd}"
+                            Content="搜索" />
+                        <Button
+                            Width="120"
+                            Height="30"
+                            Margin="10,10,10,10"
+                            HorizontalAlignment="Center"
+                            Background="Orange"
+                            Command="{Binding OutputDataCmd}"
+                            Content="导出数据" />
+                    </StackPanel>
+                </Grid>
+
+            </StackPanel>
+        </GroupBox>
+        <Grid
+            Grid.Row="1"
+            Height="680"
+            Margin="8">
+            <DataGrid
+                x:Name="dg1"
+                Grid.ColumnSpan="2"
+                AutoGenerateColumns="False"
+                IsReadOnly="True"
+                ItemsSource="{Binding ListModelDto}"
+                SelectionMode="Single"
+                SelectionUnit="Cell">
+                <!--<i:Interaction.Triggers>
+                    <i:EventTrigger EventName="SelectionChanged">
+                        <i:InvokeCommandAction Command="{Binding SelectedItemsCmd}" CommandParameter="{Binding ElementName=dg1}" />
+                    </i:EventTrigger>
+                </i:Interaction.Triggers>-->
+                <DataGrid.Columns>
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding MachineModel}"
+                        Header="机种名" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldStation}"
+                        Header="焊接工位" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding OpNo}"
+                        Header="员工编号" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding Cur}"
+                        Header="电流值(KA)" />
+
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding ElectrodeModel}"
+                        Header="电极型号" />
+
+                    <DataGridTextColumn
+                        Width="200"
+                        Binding="{Binding WeldTime}"
+                        Header="焊接时间" />
+
+                    <DataGridTextColumn
+                        Width="180"
+                        Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+                        Header="创建时间" />
+                </DataGrid.Columns>
+            </DataGrid>
+        </Grid>
+
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/TermWeld/TermWeldView.xaml.cs b/GroupLine.App/View/TermWeld/TermWeldView.xaml.cs
new file mode 100644
index 0000000..7d27096
--- /dev/null
+++ b/GroupLine.App/View/TermWeld/TermWeldView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace GroupLine.App.View.TermWeld
+{
+    /// <summary>
+    /// TermWeldView.xaml 的交互逻辑
+    /// </summary>
+    public partial class TermWeldView : UserControl
+    {
+        public TermWeldView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/GroupLine.App/View/UserControlMenuItem.xaml b/GroupLine.App/View/UserControlMenuItem.xaml
new file mode 100644
index 0000000..3879584
--- /dev/null
+++ b/GroupLine.App/View/UserControlMenuItem.xaml
@@ -0,0 +1,47 @@
+<UserControl
+    x:Class="GroupLine.App.View.UserControlMenuItem"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:GroupLine.App.View"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <Grid>
+        <materialDesign:PackIcon
+            Width="15"
+            Height="15"
+            Margin="10,16"
+            Foreground="White"
+            Kind="{Binding Path=Icon}" />
+        <ListBoxItem
+            x:Name="ListViewItemMenu"
+            Padding="37,14"
+            Content="{Binding Path=Header}"
+            FontSize="15"
+            Foreground="White" />
+        <Expander
+            x:Name="ExpanderMenu"
+            Width="210"
+            HorizontalAlignment="Right"
+            Background="{x:Null}"
+            Foreground="White"
+            Header="{Binding Path=Header}"
+            IsExpanded="False">
+            <ListView
+                x:Name="ListViewMenu"
+                Foreground="White"
+                ItemsSource="{Binding Path=SubItems}"
+                ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                SelectionChanged="ListViewMenu_SelectionChanged">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Padding="20,5" Text="{Binding Path=Name}" />
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
+        </Expander>
+    </Grid>
+</UserControl>
diff --git a/GroupLine.App/View/UserControlMenuItem.xaml.cs b/GroupLine.App/View/UserControlMenuItem.xaml.cs
new file mode 100644
index 0000000..b2bd16f
--- /dev/null
+++ b/GroupLine.App/View/UserControlMenuItem.xaml.cs
@@ -0,0 +1,30 @@
+using GroupLine.App.ViewModel;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace GroupLine.App.View
+{
+    /// <summary>
+    /// UserControlMenuItem.xaml 的交互逻辑
+    /// </summary>
+    public partial class UserControlMenuItem : UserControl
+    {
+        MainWindow _context;
+
+        public UserControlMenuItem(ItemMenu itemMenu, MainWindow context)
+        {
+            InitializeComponent();
+            _context = context;
+
+            ExpanderMenu.Visibility = itemMenu.SubItems == null ? Visibility.Collapsed : Visibility.Visible;
+            ListViewItemMenu.Visibility = itemMenu.SubItems == null ? Visibility.Visible : Visibility.Collapsed;
+
+            this.DataContext = itemMenu;
+        }
+        private void ListViewMenu_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            _context.SwitchScreen(((SubItem)((ListView)sender).SelectedItem).Screen);
+            //ListViewMenu.SelectedIndex = -1;
+        }
+    }
+}
diff --git a/GroupLine.App/ViewModel/AppearanceTestViewModel.cs b/GroupLine.App/ViewModel/AppearanceTestViewModel.cs
new file mode 100644
index 0000000..97b5350
--- /dev/null
+++ b/GroupLine.App/ViewModel/AppearanceTestViewModel.cs
@@ -0,0 +1,379 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.App.ModelDto;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+
+namespace GroupLine.App.ViewModel
+{
+    public class AppearanceTestViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "外观检查";
+
+        private string CurrentMachineNameTemplate = "AppearanceTestTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public AppearanceTestViewModel()
+        {
+            ListAppearanceTestDto = new ObservableCollection<AppearanceTestDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(10).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<AppearanceTest, AppearanceTestDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<AppearanceTestDto> _ListAppearanceTestDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<AppearanceTestDto> ListAppearanceTestDto
+        {
+            get { return _ListAppearanceTestDto; }
+            set { _ListAppearanceTestDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchPlaqueNo;
+
+        public string SearchPlaqueNo
+        {
+            get
+            {
+                return searchPlaqueNo;
+            }
+            set
+            {
+                searchPlaqueNo = value;
+                RaisePropertyChanged(() => SearchPlaqueNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<AppearanceTest>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchPlaqueNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.PlaqueNo.Contains(SearchPlaqueNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                ////多条件查询
+                //if (!string.IsNullOrEmpty(SearchEndDate))
+                //{
+                //    MulConQueryable = MulConQueryable.Where(t => t.EndTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                //}
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListAppearanceTestDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListAppearanceTestDto.Add(autoMapper.Map<AppearanceTestDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListAppearanceTestDto != null && ListAppearanceTestDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListAppearanceTestDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].PlaqueNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].ProLineNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].MachineTypeCheck.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].PlaqueCheck.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].TerminalCheck.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].ElectricalBoxCheck.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].SealingPlugCheck.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].InOutTubeCheck.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].UpperCoverCheck.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].ReservoirCheck.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].HandTubeCheck.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].WeldCheck.ToString());
+                        row.CreateCell(12).SetCellValue(ListData[i].PaintCheck.ToString());
+                        row.CreateCell(13).SetCellValue(ListData[i].LiftLugCheck.ToString());
+                        row.CreateCell(14).SetCellValue(ListData[i].GirthWeldCheck.ToString());
+                        row.CreateCell(15).SetCellValue(ListData[i].WeldSlagCheck.ToString());
+                        row.CreateCell(16).SetCellValue(ListData[i].FastenLeatherPadCheck.ToString());
+                        row.CreateCell(17).SetCellValue(ListData[i].CylinderCheck.ToString());
+                        row.CreateCell(18).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(19).SetCellValue(ListData[i].OperationNo.ToString());
+                        row.CreateCell(20).SetCellValue(ListData[i].CreateTime.ToString("yyyy - MM - dd HH: mm"));
+
+
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(20).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/BurPlugInstallViewModel.cs b/GroupLine.App/ViewModel/BurPlugInstallViewModel.cs
new file mode 100644
index 0000000..4ca36e1
--- /dev/null
+++ b/GroupLine.App/ViewModel/BurPlugInstallViewModel.cs
@@ -0,0 +1,362 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.App.ModelDto;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+
+namespace GroupLine.App.ViewModel
+{
+    public class BurPlugInstallViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "埋塞敲入螺旋钉安装";
+
+        private string CurrentMachineNameTemplate = "BurPlugInstallTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public BurPlugInstallViewModel()
+        {
+            ListModelDto = new ObservableCollection<BurPlugInstallDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<BurPlugInstall, BurPlugInstallDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<BurPlugInstallDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<BurPlugInstallDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<BurPlugInstall>();
+
+                ////多条件查询
+                //if (!string.IsNullOrEmpty(SearchCylinderNo))
+                //{
+                //    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                //}
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<BurPlugInstallDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].StaticDiskNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].SpiralScrewCheck.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].StaDycDiskCheck.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].CoverPlugCheck.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/CylinderEngravViewModel.cs b/GroupLine.App/ViewModel/CylinderEngravViewModel.cs
new file mode 100644
index 0000000..d4253b8
--- /dev/null
+++ b/GroupLine.App/ViewModel/CylinderEngravViewModel.cs
@@ -0,0 +1,359 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.App.ModelDto;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+
+namespace GroupLine.App.ViewModel
+{
+    public class CylinderEngravViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "筒体刻印机";
+
+        private string CurrentMachineNameTemplate = "CylinderEngravTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public CylinderEngravViewModel()
+        {
+            ListModelDto = new ObservableCollection<CylinderEngravDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<CylinderEngrav, CylinderEngravDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<CylinderEngravDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<CylinderEngravDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<CylinderEngrav>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<CylinderEngravDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(2).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/DbDataClearViewModel.cs b/GroupLine.App/ViewModel/DbDataClearViewModel.cs
new file mode 100644
index 0000000..32193b7
--- /dev/null
+++ b/GroupLine.App/ViewModel/DbDataClearViewModel.cs
@@ -0,0 +1,161 @@
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.App;
+using GroupLine.Com;
+using NLog;
+using NPOI.SS.Formula.Functions;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace YC5.App.ViewModel
+{
+    public class DbDataClearViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// 设备集合
+        /// 供备份和删除使用
+        /// </summary>
+        private List<string> ListMachine { get; set; }
+
+        public DbDataClearViewModel()
+        {
+            ActionCmdDate = DateTime.Now.AddMonths(-6).ToString();
+            ListMachine = new List<string>()
+            {
+                "MagTorque",
+                "OilPumpInstall",
+            };
+        }
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string actionCmdDate;
+
+        public string ActionCmdDate
+        {
+            get
+            {
+                return actionCmdDate;
+            }
+            set
+            {
+                actionCmdDate = value;
+                RaisePropertyChanged(() => ActionCmdDate);
+            }
+        }
+
+
+        /// <summary>
+        /// 执行命令
+        /// </summary>
+        private RelayCommand actionCmd;
+        public RelayCommand ActionCmd
+        {
+            get
+            {
+                if (actionCmd == null) return new RelayCommand(() => Cmd());
+                return actionCmd;
+            }
+            set
+            {
+                actionCmd = value;
+            }
+        }
+
+        private void Cmd()
+        {
+            var Location = ConfigHelper.GetValue("Location");
+
+            var dataInfo = DateTime.Parse(ActionCmdDate);
+
+            DialogResult dialogResult = System.Windows.Forms.MessageBox.Show("你确定要删除数据吗？请谨慎确认时间，否则可能影响系统运行！！！将会花费一些时间", "删除数据", MessageBoxButtons.OKCancel, MessageBoxIcon.Information);
+            if (dialogResult == DialogResult.Cancel)
+            {
+                return;
+            }
+
+            _Logger.Info($"时间：{DateTime.Now.ToString()} -删除了数据，时间节点为：{dataInfo.ToString()}");
+
+            // 编写备份数据库的 T-SQL 语句
+            string sql = "BACKUP DATABASE YourDatabaseName TO DISK = 'C:\\Backup\\YourDatabaseName.bak'";
+
+            // 执行 SQL 语句
+            //fsql.Ado.ExecuteNonQuery(sql);
+
+
+            Task.Run(() =>
+            {
+                //BACKUP DATABASE[YourDatabase] TO DISK = N'YourDatabase_backup.bak';
+                FSqlContext.FDb.Ado.ExecuteNonQuery($"BACKUP DATABASE GroupLine TO DISK = N'GroupLine_backup_{DateTime.Now.ToString("yyyy-MM-dd")}.bak'");
+
+                foreach (var item in ListMachine)
+                {
+                    // 字符串类型名称
+                    string typeName = $"GroupLine.Model.{item}";
+
+                    // 获取类型对象
+                    Type type = Type.GetType(typeName);
+                    if (type != null)
+                    {
+                        // 创建实例
+                        object instance = Activator.CreateInstance(type);
+
+                        // 将实例转换为相应类型
+                        var typedInstance = Convert.ChangeType(instance, type);
+
+                        // 现在你可以使用 typedInstance，它是具有你指定类型的实例
+                        // 这里可以进行其他操作，如调用方法、设置属性等
+
+                        //FSqlContext.FDb.Delete<type>().Where(a => a.Crea <= dataInfo).ExecuteAffrows();
+                    }
+
+                }
+
+                //FSqlContext.FDb.Delete<B_9SpotWeld1>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_9SpotWeld2>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_BracketWeld>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_Check>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_CylinderHeatPr>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_CylinderHeatSe>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_InsertDev>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_LaserPrint>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_LugWeld1>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_LugWeld2>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_NutWeld>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<B_TransferInsDev>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_6SpotWeld1>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_6SpotWeld2>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_DimensCheck>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_GaugeAutoIn>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_InsulaResCheck>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_LowCoverWeld1>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_LowCoverWeld2>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_RobotHand>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_RobotHandIn>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_RobotHandOut>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_SegmentDiffMes>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_SuctionPePre1>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_SuctionPePre2>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_UpCoverWeld1>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<H_UpCoverWeld2>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<Z_MagnetizDev>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<Z_RobotHand>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+                //FSqlContext.FDb.Delete<Z_RotorHotPres>().Where(a => a.EndTime <= dataInfo).ExecuteAffrows();
+
+                System.Windows.Application.Current.Dispatcher.Invoke(() =>
+                {
+                    System.Windows.MessageBox.Show("处理完成");
+                });
+            });
+
+        }
+    }
+}
diff --git a/GroupLine.App/ViewModel/ExhInstallMesViewModel.cs b/GroupLine.App/ViewModel/ExhInstallMesViewModel.cs
new file mode 100644
index 0000000..51075ea
--- /dev/null
+++ b/GroupLine.App/ViewModel/ExhInstallMesViewModel.cs
@@ -0,0 +1,388 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using GroupLine.App.ModelDto;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+
+namespace GroupLine.App.ViewModel
+{
+    public class ExhInstallMesViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "排气盖板安装气密检测";
+
+        private string CurrentMachineNameTemplate = "ExhInstallMesTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public ExhInstallMesViewModel()
+        {
+            ListModelDto = new ObservableCollection<ExhInstallMesDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<ExhInstallMes, ExhInstallMesDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<ExhInstallMesDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<ExhInstallMesDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<ExhInstallMes>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<ExhInstallMesDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].MachineCode.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].StaticDiskNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].DynaDiskNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].Cycle.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].ScrewCount.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].ExhausTorque.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].FinalAngle.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].ExhausTorque2.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].FinalAngle2.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].ExhausTorque3.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].FinalAngle3.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].ExhausTorque4.ToString());
+                        row.CreateCell(12).SetCellValue(ListData[i].FinalAngle4.ToString());
+                        row.CreateCell(13).SetCellValue(ListData[i].ExhausTorque5.ToString());
+                        row.CreateCell(14).SetCellValue(ListData[i].FinalAngle5.ToString());
+                        row.CreateCell(15).SetCellValue(ListData[i].ExhausTorque6.ToString());
+                        row.CreateCell(16).SetCellValue(ListData[i].FinalAngle6.ToString());
+                        row.CreateCell(17).SetCellValue(ListData[i].ExhausTorque7.ToString());
+                        row.CreateCell(18).SetCellValue(ListData[i].FinalAngle7.ToString());
+                        row.CreateCell(19).SetCellValue(ListData[i].ExhausTorque8.ToString());
+                        row.CreateCell(20).SetCellValue(ListData[i].FinalAngle8.ToString());
+                        row.CreateCell(21).SetCellValue(ListData[i].ExhausTorque9.ToString());
+                        row.CreateCell(22).SetCellValue(ListData[i].FinalAngle9.ToString());
+                        row.CreateCell(23).SetCellValue(ListData[i].ExhausTorque10.ToString());
+                        row.CreateCell(24).SetCellValue(ListData[i].FinalAngle10.ToString());
+                        row.CreateCell(25).SetCellValue(ListData[i].ExhausTorque11.ToString());
+                        row.CreateCell(26).SetCellValue(ListData[i].FinalAngle11.ToString());
+                        row.CreateCell(27).SetCellValue(ListData[i].ExhausTorque12.ToString());
+                        row.CreateCell(28).SetCellValue(ListData[i].FinalAngle12.ToString());
+                        row.CreateCell(29).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(30).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(31).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(31).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GCDTransplantViewModel.cs b/GroupLine.App/ViewModel/GCDTransplantViewModel.cs
new file mode 100644
index 0000000..71f72cb
--- /dev/null
+++ b/GroupLine.App/ViewModel/GCDTransplantViewModel.cs
@@ -0,0 +1,358 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GCDTransplantViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型C-D移栽";
+
+        private string CurrentMachineNameTemplate = "GCDTransplantTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GCDTransplantViewModel()
+        {
+            ListModelDto = new ObservableCollection<GCDTransplantDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GCDTransplant, GCDTransplantDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GCDTransplantDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GCDTransplantDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GCDTransplant>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GCDTransplantDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(1).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GCylinderBurnEbViewModel.cs b/GroupLine.App/ViewModel/GCylinderBurnEbViewModel.cs
new file mode 100644
index 0000000..768afdd
--- /dev/null
+++ b/GroupLine.App/ViewModel/GCylinderBurnEbViewModel.cs
@@ -0,0 +1,362 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GCylinderBurnEbViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型筒体烧嵌";
+
+        private string CurrentMachineNameTemplate = "GCylinderBurnEbTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GCylinderBurnEbViewModel()
+        {
+            ListModelDto = new ObservableCollection<GCylinderBurnEbDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GCylinderBurnEb, GCylinderBurnEbDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GCylinderBurnEbDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GCylinderBurnEbDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GCylinderBurnEb>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GCylinderBurnEbDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].StatoNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].ATrayNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].CylinderTemp.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GDynStaticMachViewModel.cs b/GroupLine.App/ViewModel/GDynStaticMachViewModel.cs
new file mode 100644
index 0000000..00a5dcf
--- /dev/null
+++ b/GroupLine.App/ViewModel/GDynStaticMachViewModel.cs
@@ -0,0 +1,365 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GDynStaticMachViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型动静盘组装机";
+
+        private string CurrentMachineNameTemplate = "GDynStaticMachTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GDynStaticMachViewModel()
+        {
+            ListModelDto = new ObservableCollection<GDynStaticMachDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GDynStaticMach, GDynStaticMachDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GDynStaticMachDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GDynStaticMachDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GDynStaticMach>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                //var sql= MulConQueryable.ToSql();
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GDynStaticMachDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].DynaDiskNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].StaticDiskNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].EuropMacine.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].StaDskCastNo.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].OpNo.ToString());
+                        //row.CreateCell(6).SetCellValue(ListData[i].Torque.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(6).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GInsRotaResViewModel.cs b/GroupLine.App/ViewModel/GInsRotaResViewModel.cs
new file mode 100644
index 0000000..25b43fd
--- /dev/null
+++ b/GroupLine.App/ViewModel/GInsRotaResViewModel.cs
@@ -0,0 +1,365 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GInsRotaResViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型绝缘、回转方向、电阻测量";
+
+        private string CurrentMachineNameTemplate = "GInsRotaResTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GInsRotaResViewModel()
+        {
+            ListModelDto = new ObservableCollection<GInsRotaResDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GInsRotaRes, GInsRotaResDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GInsRotaResDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GInsRotaResDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GInsRotaRes>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GInsRotaResDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].IsolateResults.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].ResValue1.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].ResValue2.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].ResValue3.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].RotaResult.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].ResResult.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(8).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GLeakCheckViewModel.cs b/GroupLine.App/ViewModel/GLeakCheckViewModel.cs
new file mode 100644
index 0000000..09ad4af
--- /dev/null
+++ b/GroupLine.App/ViewModel/GLeakCheckViewModel.cs
@@ -0,0 +1,362 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GLeakCheckViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型高低压泄露检查";
+
+        private string CurrentMachineNameTemplate = "GLeakCheckTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GLeakCheckViewModel()
+        {
+            ListModelDto = new ObservableCollection<GLeakCheckDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GLeakCheck, GLeakCheckDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GLeakCheckDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GLeakCheckDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GLeakCheck>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GLeakCheckDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].PumpVacuum.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].KeepVacuum.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].PumpVamResult.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].KeepVamResult.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GLowVolStartViewModel.cs b/GroupLine.App/ViewModel/GLowVolStartViewModel.cs
new file mode 100644
index 0000000..ed75f06
--- /dev/null
+++ b/GroupLine.App/ViewModel/GLowVolStartViewModel.cs
@@ -0,0 +1,363 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GLowVolStartViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型低电压启动";
+
+        private string CurrentMachineNameTemplate = "GLowVolStartTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GLowVolStartViewModel()
+        {
+            ListModelDto = new ObservableCollection<GLowVolStartDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GLowVolStart, GLowVolStartDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GLowVolStartDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GLowVolStartDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GLowVolStart>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GLowVolStartDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].ACur.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].BCur.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].CCur.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(6).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GMagTorqueViewModel.cs b/GroupLine.App/ViewModel/GMagTorqueViewModel.cs
new file mode 100644
index 0000000..27b1bd9
--- /dev/null
+++ b/GroupLine.App/ViewModel/GMagTorqueViewModel.cs
@@ -0,0 +1,361 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GMagTorqueViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型磁束扭矩检测工位";
+
+        private string CurrentMachineNameTemplate = "GMagTorqueTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GMagTorqueViewModel()
+        {
+            ListModelDto = new ObservableCollection<GMagTorqueDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GMagTorque, GMagTorqueDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GMagTorqueDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GMagTorqueDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GMagTorque>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GMagTorqueDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].MagBeamCount.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].TorqueValue.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(4).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GOilPumpInstallViewModel.cs b/GroupLine.App/ViewModel/GOilPumpInstallViewModel.cs
new file mode 100644
index 0000000..d370fab
--- /dev/null
+++ b/GroupLine.App/ViewModel/GOilPumpInstallViewModel.cs
@@ -0,0 +1,364 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GOilPumpInstallViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型油泵安装工位";
+
+        private string CurrentMachineNameTemplate = "GOilPumpInstallTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GOilPumpInstallViewModel()
+        {
+            ListModelDto = new ObservableCollection<GOilPumpInstallDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GOilPumpInstall, GOilPumpInstallDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GOilPumpInstallDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GOilPumpInstallDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GOilPumpInstall>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GOilPumpInstallDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OilPumpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].OilPmpBruRsult.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].IsReturn.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].WeldSpotUI.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(7).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GRingWeldMachViewModel.cs b/GroupLine.App/ViewModel/GRingWeldMachViewModel.cs
new file mode 100644
index 0000000..b6064c1
--- /dev/null
+++ b/GroupLine.App/ViewModel/GRingWeldMachViewModel.cs
@@ -0,0 +1,368 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GRingWeldMachViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型环焊机底部焊接";
+
+        private string CurrentMachineNameTemplate = "GRingWeldMachTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GRingWeldMachViewModel()
+        {
+            ListModelDto = new ObservableCollection<GRingWeldMachDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GRingWeldMach, GRingWeldMachDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GRingWeldMachDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GRingWeldMachDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GRingWeldMach>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GRingWeldMachDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].Vol1.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].Cur1.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].WeldTime1.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Vol2.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].Cur2.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].WeldTime2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].NozzleClean.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].NozzleReplace.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].Fixture.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(11).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GRotorBurnEbViewModel.cs b/GroupLine.App/ViewModel/GRotorBurnEbViewModel.cs
new file mode 100644
index 0000000..c60abb9
--- /dev/null
+++ b/GroupLine.App/ViewModel/GRotorBurnEbViewModel.cs
@@ -0,0 +1,360 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GRotorBurnEbViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型转子烧嵌";
+
+        private string CurrentMachineNameTemplate = "GRotorBurnEbTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GRotorBurnEbViewModel()
+        {
+            ListModelDto = new ObservableCollection<GRotorBurnEbDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GRotorBurnEb, GRotorBurnEbDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GRotorBurnEbDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GRotorBurnEbDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GRotorBurnEb>();
+
+                //多条件查询
+                //if (!string.IsNullOrEmpty(SearchCylinderNo))
+                //{
+                //    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                //}
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GRotorBurnEbDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].RotorNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].CrankshaftNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(3).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GRotorMagViewModel.cs b/GroupLine.App/ViewModel/GRotorMagViewModel.cs
new file mode 100644
index 0000000..d46c2f6
--- /dev/null
+++ b/GroupLine.App/ViewModel/GRotorMagViewModel.cs
@@ -0,0 +1,363 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GRotorMagViewModel: ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型转子着磁";
+
+        private string CurrentMachineNameTemplate = "GRotorMagTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GRotorMagViewModel()
+        {
+            ListModelDto = new ObservableCollection<GRotorMagDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GRotorMag, GRotorMagDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GRotorMagDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GRotorMagDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GRotorMag>();
+
+                ////多条件查询
+                //if (!string.IsNullOrEmpty(SearchCylinderNo))
+                //{
+                //    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                //}
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GRotorMagDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].RotorNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].MagBeamCount.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].Current.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].RotorAngle.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].RotorAgleRsult.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(6).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GShrinkTubViewModel.cs b/GroupLine.App/ViewModel/GShrinkTubViewModel.cs
new file mode 100644
index 0000000..cf1c62e
--- /dev/null
+++ b/GroupLine.App/ViewModel/GShrinkTubViewModel.cs
@@ -0,0 +1,362 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GShrinkTubViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型缩管";
+
+        private string CurrentMachineNameTemplate = "GShrinkTubTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GShrinkTubViewModel()
+        {
+            ListModelDto = new ObservableCollection<GShrinkTubDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GShrinkTub, GShrinkTubDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GShrinkTubDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GShrinkTubDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GShrinkTub>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GShrinkTubDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].FinalLoad.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].FinalLocation.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GSpotWeldMachViewModel.cs b/GroupLine.App/ViewModel/GSpotWeldMachViewModel.cs
new file mode 100644
index 0000000..3538bbd
--- /dev/null
+++ b/GroupLine.App/ViewModel/GSpotWeldMachViewModel.cs
@@ -0,0 +1,384 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GSpotWeldMachViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型点焊机";
+
+        private string CurrentMachineNameTemplate = "GSpotWeldMachTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GSpotWeldMachViewModel()
+        {
+            ListModelDto = new ObservableCollection<GSpotWeldMachDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GSpotWeldMach, GSpotWeldMachDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GSpotWeldMachDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GSpotWeldMachDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GSpotWeldMach>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GSpotWeldMachDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].VolR1_1.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].CurR1_1.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].WeldTimeR1_1.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].VolR1_2.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CurR1_2.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].WeldTimeR1_2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].VolR1_3.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].CurR1_3.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].WeldTimeR1_3.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].VolR1_4.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].CurR1_4.ToString());
+                        row.CreateCell(12).SetCellValue(ListData[i].WeldTimeR1_4.ToString());
+                        row.CreateCell(13).SetCellValue(ListData[i].VolR2_1.ToString());
+                        row.CreateCell(14).SetCellValue(ListData[i].CurR2_1.ToString());
+                        row.CreateCell(15).SetCellValue(ListData[i].WeldTimeR2_1.ToString());
+                        row.CreateCell(16).SetCellValue(ListData[i].VolR2_2.ToString());
+                        row.CreateCell(17).SetCellValue(ListData[i].CurR2_2.ToString());
+                        row.CreateCell(18).SetCellValue(ListData[i].WeldTimeR2_2.ToString());
+                        row.CreateCell(19).SetCellValue(ListData[i].VolR2_3.ToString());
+                        row.CreateCell(20).SetCellValue(ListData[i].CurR2_3.ToString());
+                        row.CreateCell(21).SetCellValue(ListData[i].WeldTimeR2_3.ToString());
+                        row.CreateCell(22).SetCellValue(ListData[i].VolR2_4.ToString());
+                        row.CreateCell(23).SetCellValue(ListData[i].CurR2_4.ToString());
+                        row.CreateCell(24).SetCellValue(ListData[i].WeldTimeR2_4.ToString());
+                        row.CreateCell(25).SetCellValue(ListData[i].NozzleClean.ToString());
+                        row.CreateCell(26).SetCellValue(ListData[i].NozzleReplace.ToString());
+                        row.CreateCell(27).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(27).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/GStaticDiskMachViewModel.cs b/GroupLine.App/ViewModel/GStaticDiskMachViewModel.cs
new file mode 100644
index 0000000..06200d4
--- /dev/null
+++ b/GroupLine.App/ViewModel/GStaticDiskMachViewModel.cs
@@ -0,0 +1,387 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class GStaticDiskMachViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型静盘组装机";
+
+        private string CurrentMachineNameTemplate = "GStaticDiskMachTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public GStaticDiskMachViewModel()
+        {
+            ListModelDto = new ObservableCollection<GStaticDiskMachDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<GStaticDiskMach, GStaticDiskMachDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<GStaticDiskMachDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<GStaticDiskMachDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<GStaticDiskMach>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<GStaticDiskMachDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].MachineCode.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].Cycle.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].ScrewCount.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].FinalTorque.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].FinalAngle.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].FinalTorque2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].FinalAngle2.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].FinalTorque3.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].FinalAngle3.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].FinalTorque4.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].FinalAngle4.ToString());
+                        row.CreateCell(12).SetCellValue(ListData[i].FinalTorque5.ToString());
+                        row.CreateCell(13).SetCellValue(ListData[i].FinalAngle5.ToString());
+                        row.CreateCell(14).SetCellValue(ListData[i].FinalTorque6.ToString());
+                        row.CreateCell(15).SetCellValue(ListData[i].FinalAngle6.ToString());
+                        row.CreateCell(16).SetCellValue(ListData[i].FinalTorque7.ToString());
+                        row.CreateCell(17).SetCellValue(ListData[i].FinalAngle7.ToString());
+                        row.CreateCell(18).SetCellValue(ListData[i].FinalTorque8.ToString());
+                        row.CreateCell(19).SetCellValue(ListData[i].FinalAngle8.ToString());
+                        row.CreateCell(20).SetCellValue(ListData[i].FinalTorque9.ToString());
+                        row.CreateCell(21).SetCellValue(ListData[i].FinalAngle9.ToString());
+                        row.CreateCell(22).SetCellValue(ListData[i].FinalTorque10.ToString());
+                        row.CreateCell(23).SetCellValue(ListData[i].FinalAngle10.ToString());
+                        row.CreateCell(24).SetCellValue(ListData[i].FinalTorque11.ToString());
+                        row.CreateCell(25).SetCellValue(ListData[i].FinalAngle11.ToString());
+                        row.CreateCell(26).SetCellValue(ListData[i].FinalTorque12.ToString());
+                        row.CreateCell(27).SetCellValue(ListData[i].FinalAngle12.ToString());
+                        row.CreateCell(28).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(29).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(30).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(30).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/ItemMenu.cs b/GroupLine.App/ViewModel/ItemMenu.cs
new file mode 100644
index 0000000..a739eb5
--- /dev/null
+++ b/GroupLine.App/ViewModel/ItemMenu.cs
@@ -0,0 +1,28 @@
+using MaterialDesignThemes.Wpf;
+using System.Collections.Generic;
+using System.Windows.Controls;
+
+namespace GroupLine.App.ViewModel
+{
+    public class ItemMenu
+    {
+        public ItemMenu(string header, List<SubItem> subItems, PackIconKind icon)
+        {
+            Header = header;
+            SubItems = subItems;
+            Icon = icon;
+        }
+
+        public ItemMenu(string header, UserControl screen, PackIconKind icon)
+        {
+            Header = header;
+            Screen = screen;
+            Icon = icon;
+        }
+
+        public string Header { get; private set; }
+        public PackIconKind Icon { get; private set; }
+        public List<SubItem> SubItems { get; private set; }
+        public UserControl Screen { get; private set; }
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPCDTransplantViewModel.cs b/GroupLine.App/ViewModel/KPCDTransplantViewModel.cs
new file mode 100644
index 0000000..3c53947
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPCDTransplantViewModel.cs
@@ -0,0 +1,358 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPCDTransplantViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型C-D移栽";
+
+        private string CurrentMachineNameTemplate = "KPCDTransplantTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPCDTransplantViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPCDTransplantDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPCDTransplant, KPCDTransplantDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPCDTransplantDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPCDTransplantDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPCDTransplant>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPCDTransplantDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(1).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPDynStaticMachViewModel.cs b/GroupLine.App/ViewModel/KPDynStaticMachViewModel.cs
new file mode 100644
index 0000000..6559c63
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPDynStaticMachViewModel.cs
@@ -0,0 +1,368 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPDynStaticMachViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型动静盘组装机";
+
+        private string CurrentMachineNameTemplate = "KPDynStaticMachTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPDynStaticMachViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPDynStaticMachDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPDynStaticMach, KPDynStaticMachDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPDynStaticMachDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPDynStaticMachDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPDynStaticMach>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                //var sql = MulConQueryable.ToSql();
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPDynStaticMachDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].DynaDiskNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].StaticDiskNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].EuropMacine.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].StaDskCastNo.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].MeterGap.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].MeterGroup.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].MeterResult.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].OpNo.ToString());
+                        //row.CreateCell(6).SetCellValue(ListData[i].Torque.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].EuopMaDifValue.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(10).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPLeakCheckViewModel.cs b/GroupLine.App/ViewModel/KPLeakCheckViewModel.cs
new file mode 100644
index 0000000..29bf645
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPLeakCheckViewModel.cs
@@ -0,0 +1,362 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPLeakCheckViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型C-D移栽";
+
+        private string CurrentMachineNameTemplate = "KPLeakCheckTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPLeakCheckViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPLeakCheckDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPLeakCheck, KPLeakCheckDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPLeakCheckDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPLeakCheckDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPLeakCheck>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPLeakCheckDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].PumpVacuum.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].KeepVacuum.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].PumpVamResult.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].KeepVamResult.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPLowVolStartViewModel.cs b/GroupLine.App/ViewModel/KPLowVolStartViewModel.cs
new file mode 100644
index 0000000..2bab57a
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPLowVolStartViewModel.cs
@@ -0,0 +1,363 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPLowVolStartViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型低电压启动";
+
+        private string CurrentMachineNameTemplate = "KPLowVolStartTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPLowVolStartViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPLowVolStartDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPLowVolStart, KPLowVolStartDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPLowVolStartDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPLowVolStartDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPLowVolStart>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPLowVolStartDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].ACur.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].BCur.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].CCur.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(6).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPMagTorqueViewModel.cs b/GroupLine.App/ViewModel/KPMagTorqueViewModel.cs
new file mode 100644
index 0000000..9b90ed8
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPMagTorqueViewModel.cs
@@ -0,0 +1,361 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPMagTorqueViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型磁束扭矩检测工位";
+
+        private string CurrentMachineNameTemplate = "KPMagTorqueTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPMagTorqueViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPMagTorqueDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPMagTorque, KPMagTorqueDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPMagTorqueDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPMagTorqueDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPMagTorque>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPMagTorqueDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].MagBeamCount.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].TorqueValue.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(4).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPOilPumpInstallViewModel.cs b/GroupLine.App/ViewModel/KPOilPumpInstallViewModel.cs
new file mode 100644
index 0000000..eea4faf
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPOilPumpInstallViewModel.cs
@@ -0,0 +1,364 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPOilPumpInstallViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型油泵安装工位";
+
+        private string CurrentMachineNameTemplate = "KPOilPumpInstallTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPOilPumpInstallViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPOilPumpInstallDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPOilPumpInstall, KPOilPumpInstallDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPOilPumpInstallDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPOilPumpInstallDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPOilPumpInstall>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPOilPumpInstallDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OilPumpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].OilPmpBruRsult.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].IsReturn.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].WeldSpotUI.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(7).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPRingWeldMachDwViewModel.cs b/GroupLine.App/ViewModel/KPRingWeldMachDwViewModel.cs
new file mode 100644
index 0000000..92e3466
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPRingWeldMachDwViewModel.cs
@@ -0,0 +1,371 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GroupLine.App.ModelDto;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Windows;
+using GalaSoft.MvvmLight.Command;
+using MessageBox = System.Windows.MessageBox;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPRingWeldMachDwViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型环焊机底部焊接";
+
+        private string CurrentMachineNameTemplate = "KPRingWeldMachDwTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPRingWeldMachDwViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPRingWeldMachDwDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPRingWeldMachDw, KPRingWeldMachDwDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPRingWeldMachDwDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPRingWeldMachDwDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPRingWeldMachDw>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPRingWeldMachDwDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].Vol1.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].Cur1.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].WeldTime1.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Vol2.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].Cur2.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].WeldTime2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].NozzleClean.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].NozzleReplace.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].Fixture.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(11).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPRingWeldMachUpViewModel.cs b/GroupLine.App/ViewModel/KPRingWeldMachUpViewModel.cs
new file mode 100644
index 0000000..92f2351
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPRingWeldMachUpViewModel.cs
@@ -0,0 +1,371 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GroupLine.App.ModelDto;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Windows;
+using GalaSoft.MvvmLight.Command;
+using MessageBox = System.Windows.MessageBox;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPRingWeldMachUpViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型环焊机顶部焊接";
+
+        private string CurrentMachineNameTemplate = "KPRingWeldMachUpTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPRingWeldMachUpViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPRingWeldMachUpDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPRingWeldMachUp, KPRingWeldMachUpDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPRingWeldMachUpDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPRingWeldMachUpDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPRingWeldMachUp>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPRingWeldMachUpDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].Vol1.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].Cur1.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].WeldTime1.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Vol2.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].Cur2.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].WeldTime2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].NozzleClean.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].NozzleReplace.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].Fixture.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(11).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPRingWeldMachViewModel.cs b/GroupLine.App/ViewModel/KPRingWeldMachViewModel.cs
new file mode 100644
index 0000000..e7f0253
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPRingWeldMachViewModel.cs
@@ -0,0 +1,368 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPRingWeldMachViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "G型环焊机顶部焊接";
+
+        private string CurrentMachineNameTemplate = "KPRingWeldMachTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPRingWeldMachViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPRingWeldMachDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPRingWeldMach, KPRingWeldMachDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPRingWeldMachDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPRingWeldMachDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPRingWeldMach>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPRingWeldMachDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].Vol1.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].Cur1.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].WeldTime1.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Vol2.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].Cur2.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].WeldTime2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].NozzleClean.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].NozzleReplace.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].Fixture.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(11).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPSealInstallViewModel.cs b/GroupLine.App/ViewModel/KPSealInstallViewModel.cs
new file mode 100644
index 0000000..eb1c24c
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPSealInstallViewModel.cs
@@ -0,0 +1,386 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPSealInstallViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型密封盖板安装";
+
+        private string CurrentMachineNameTemplate = "KPSealInstallTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPSealInstallViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPSealInstallDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPSealInstall, KPSealInstallDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPSealInstallDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPSealInstallDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPSealInstall>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPSealInstallDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].SealCover.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].Cycle.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].ScrewCount.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].FinalTorque.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].FinalAngle.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].FinalTorque2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].FinalAngle2.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].FinalTorque3.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].FinalAngle3.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].FinalTorque4.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].FinalAngle4.ToString());
+                        row.CreateCell(12).SetCellValue(ListData[i].FinalTorque5.ToString());
+                        row.CreateCell(13).SetCellValue(ListData[i].FinalAngle5.ToString());
+                        row.CreateCell(14).SetCellValue(ListData[i].FinalTorque6.ToString());
+                        row.CreateCell(15).SetCellValue(ListData[i].FinalAngle6.ToString());
+                        row.CreateCell(16).SetCellValue(ListData[i].FinalTorque7.ToString());
+                        row.CreateCell(17).SetCellValue(ListData[i].FinalAngle7.ToString());
+                        row.CreateCell(18).SetCellValue(ListData[i].FinalTorque8.ToString());
+                        row.CreateCell(19).SetCellValue(ListData[i].FinalAngle8.ToString());
+                        row.CreateCell(20).SetCellValue(ListData[i].FinalTorque9.ToString());
+                        row.CreateCell(21).SetCellValue(ListData[i].FinalAngle9.ToString());
+                        row.CreateCell(22).SetCellValue(ListData[i].FinalTorque10.ToString());
+                        row.CreateCell(23).SetCellValue(ListData[i].FinalAngle10.ToString());
+                        row.CreateCell(24).SetCellValue(ListData[i].FinalTorque11.ToString());
+                        row.CreateCell(25).SetCellValue(ListData[i].FinalAngle11.ToString());
+                        row.CreateCell(26).SetCellValue(ListData[i].FinalTorque12.ToString());
+                        row.CreateCell(27).SetCellValue(ListData[i].FinalAngle12.ToString());
+                        row.CreateCell(28).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(29).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(29).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPShrinkTubViewModel.cs b/GroupLine.App/ViewModel/KPShrinkTubViewModel.cs
new file mode 100644
index 0000000..4b68c48
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPShrinkTubViewModel.cs
@@ -0,0 +1,365 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GroupLine.App.ModelDto;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using System.Windows;
+using GalaSoft.MvvmLight.Command;
+using MessageBox = System.Windows.MessageBox;
+
+namespace GroupLine.App.ViewModel
+{
+   public class KPShrinkTubViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP型缩管";
+
+        private string CurrentMachineNameTemplate = "KPShrinkTubTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPShrinkTubViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPShrinkTubDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPShrinkTub, KPShrinkTubDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPShrinkTubDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPShrinkTubDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPShrinkTub>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPShrinkTubDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].FinalLoad.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].FinalLocation.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPSpotWeldMachViewModel.cs b/GroupLine.App/ViewModel/KPSpotWeldMachViewModel.cs
new file mode 100644
index 0000000..2f66da8
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPSpotWeldMachViewModel.cs
@@ -0,0 +1,378 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPSpotWeldMachViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP点焊机";
+
+        private string CurrentMachineNameTemplate = "KPSpotWeldMachTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPSpotWeldMachViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPSpotWeldMachDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPSpotWeldMach, KPSpotWeldMachDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPSpotWeldMachDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPSpotWeldMachDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPSpotWeldMach>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPSpotWeldMachDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].Vol1.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].Cur1.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].WeldTime1.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Vol2.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].Cur2.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].WeldTime2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].Vol3.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].Cur3.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].WeldTime3.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].Vol4.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].Cur4.ToString());
+                        row.CreateCell(12).SetCellValue(ListData[i].WeldTime4.ToString());
+                        row.CreateCell(13).SetCellValue(ListData[i].Vol5.ToString());
+                        row.CreateCell(14).SetCellValue(ListData[i].Cur5.ToString());
+                        row.CreateCell(15).SetCellValue(ListData[i].WeldTime5.ToString());
+                        row.CreateCell(16).SetCellValue(ListData[i].Vol6.ToString());
+                        row.CreateCell(17).SetCellValue(ListData[i].Cur6.ToString());
+                        row.CreateCell(18).SetCellValue(ListData[i].WeldTime6.ToString());
+                        row.CreateCell(19).SetCellValue(ListData[i].NozzleClean.ToString());
+                        row.CreateCell(20).SetCellValue(ListData[i].NozzleReplace.ToString());
+                        row.CreateCell(21).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(21).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPStaticDiskMachViewModel.cs b/GroupLine.App/ViewModel/KPStaticDiskMachViewModel.cs
new file mode 100644
index 0000000..ef2ee0c
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPStaticDiskMachViewModel.cs
@@ -0,0 +1,387 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPStaticDiskMachViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP静盘组装机";
+
+        private string CurrentMachineNameTemplate = "KPStaticDiskMachTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPStaticDiskMachViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPStaticDiskMachDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPStaticDiskMach, KPStaticDiskMachDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPStaticDiskMachDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPStaticDiskMachDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPStaticDiskMach>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPStaticDiskMachDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].MachineCode.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].Cycle.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].ScrewCount.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].FinalTorque.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].FinalAngle.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].FinalTorque2.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].FinalAngle2.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].FinalTorque3.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].FinalAngle3.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].FinalTorque4.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].FinalAngle4.ToString());
+                        row.CreateCell(12).SetCellValue(ListData[i].FinalTorque5.ToString());
+                        row.CreateCell(13).SetCellValue(ListData[i].FinalAngle5.ToString());
+                        row.CreateCell(14).SetCellValue(ListData[i].FinalTorque6.ToString());
+                        row.CreateCell(15).SetCellValue(ListData[i].FinalAngle6.ToString());
+                        row.CreateCell(16).SetCellValue(ListData[i].FinalTorque7.ToString());
+                        row.CreateCell(17).SetCellValue(ListData[i].FinalAngle7.ToString());
+                        row.CreateCell(18).SetCellValue(ListData[i].FinalTorque8.ToString());
+                        row.CreateCell(19).SetCellValue(ListData[i].FinalAngle8.ToString());
+                        row.CreateCell(20).SetCellValue(ListData[i].FinalTorque9.ToString());
+                        row.CreateCell(21).SetCellValue(ListData[i].FinalAngle9.ToString());
+                        row.CreateCell(22).SetCellValue(ListData[i].FinalTorque10.ToString());
+                        row.CreateCell(23).SetCellValue(ListData[i].FinalAngle10.ToString());
+                        row.CreateCell(24).SetCellValue(ListData[i].FinalTorque11.ToString());
+                        row.CreateCell(25).SetCellValue(ListData[i].FinalAngle11.ToString());
+                        row.CreateCell(26).SetCellValue(ListData[i].FinalTorque12.ToString());
+                        row.CreateCell(27).SetCellValue(ListData[i].FinalAngle12.ToString());
+                        row.CreateCell(28).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(29).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(30).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(30).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KPUpBurnEbViewModel.cs b/GroupLine.App/ViewModel/KPUpBurnEbViewModel.cs
new file mode 100644
index 0000000..23112cf
--- /dev/null
+++ b/GroupLine.App/ViewModel/KPUpBurnEbViewModel.cs
@@ -0,0 +1,361 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.App.ModelDto;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KPUpBurnEbViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "KP上配重烧嵌";
+
+        private string CurrentMachineNameTemplate = "KPUpBurnEbTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public KPUpBurnEbViewModel()
+        {
+            ListModelDto = new ObservableCollection<KPUpBurnEbDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<KPUpBurnEb, KPUpBurnEbDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<KPUpBurnEbDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<KPUpBurnEbDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCrankshaftNo;
+
+        public string SearchCrankshaftNo
+        {
+            get
+            {
+                return searchCrankshaftNo;
+            }
+            set
+            {
+                searchCrankshaftNo = value;
+                RaisePropertyChanged(() => searchCrankshaftNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<KPUpBurnEb>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCrankshaftNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CrankshaftNo.Contains(SearchCrankshaftNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<KPUpBurnEbDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CrankshaftNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].ProbeA.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].ProbeB.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/KanBanViewModel.cs b/GroupLine.App/ViewModel/KanBanViewModel.cs
new file mode 100644
index 0000000..2dbc7ec
--- /dev/null
+++ b/GroupLine.App/ViewModel/KanBanViewModel.cs
@@ -0,0 +1,1021 @@
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GalaSoft.MvvmLight.Messaging;
+using GroupLine.App.ModelDto;
+using GroupLine.Com;
+using GroupLine.Model.KanBan;
+using NLog;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace GroupLine.App.ViewModel
+{
+    public class KanBanViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        //FSQL实例
+        static IFreeSql Fsql;
+
+        public KanBanViewModel()
+        {
+            try
+            {
+
+                //获取程序的配置信息
+                var SqlCon = ConfigHelper.GetValue("connecting");
+
+                Fsql = new FreeSql.FreeSqlBuilder()
+                     .UseConnectionString(FreeSql.DataType.SqlServer, SqlCon)
+                     .UseAutoSyncStructure(true) //自动同步实体结构到数据库
+                     .Build(); //请务必定义成 Singleton 单例模式
+
+                ListWorkTimeDto = new ObservableCollection<WorkTimeDto>();
+                var WorkTimeQueryable = Fsql.Select<WorkTime>().ToList();
+                foreach (var item in WorkTimeQueryable)
+                {
+                    ListWorkTimeDto.Add(new WorkTimeDto()
+                    {
+                        ID = item.Id,
+                        Index = item.IndexNum,
+                        ClassNum = item.ClassNum,
+                        EndTime = item.EndTime,
+                        StartTime = item.StartTime,
+                        CreateTime = item.CreateTime
+                    });
+                }
+                ListPlanCountDto = new ObservableCollection<PlanCountDto>();
+
+                FormWorkTimeDto = new WorkTimeDto()
+                {
+                    IsFormValid = true,
+                    //ClassNum="白班",
+                    //StartTime="00:00",
+                    //EndTime = "00:00"
+                };
+
+                FormPlanCountDto = new PlanCountDto()
+                {
+                    PlanDate = DateTime.Now
+
+                };
+
+                ClassNumComboBoxList = new List<ComboBoxModel>()
+                {
+                        new ComboBoxModel(){Key="0",Text="" },
+                    new ComboBoxModel(){Key="1",Text="A" },
+                    new ComboBoxModel(){Key="2",Text="B" },
+                    new ComboBoxModel(){Key="3",Text="C" },
+                    new ComboBoxModel(){Key="4",Text="D" }
+                };
+
+                SearchStartTime = DateTime.Now.AddDays(-5).ToShortDateString();
+                SearchEndTime = DateTime.Now.AddDays(5).ToShortDateString();
+                PlanCountSearch();
+
+                CycleTime = 0;
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        /// <summary>
+        /// 工作时间列表集合
+        /// </summary>
+        private ObservableCollection<WorkTimeDto> _ListWorkTimeDto;
+        /// <summary>
+        /// 工作时间列表集合
+        /// </summary>
+        public ObservableCollection<WorkTimeDto> ListWorkTimeDto
+        {
+            get { return _ListWorkTimeDto; }
+            set { _ListWorkTimeDto = value; }
+        }
+
+
+        /// <summary>
+        /// 计划产量列表集合
+        /// </summary>
+        private ObservableCollection<PlanCountDto> _ListPlanCountDto;
+        /// <summary>
+        /// 计划产量列表集合
+        /// </summary>
+        public ObservableCollection<PlanCountDto> ListPlanCountDto
+        {
+            get { return _ListPlanCountDto; }
+            set { _ListPlanCountDto = value; }
+        }
+
+        #region "搜索条件"
+        /// <summary>
+        /// 搜索条件-班次
+        /// </summary>
+        private string _SearchClassNum;
+
+        public string SearchClassNum
+        {
+            get
+            {
+                return _SearchClassNum;
+            }
+            set
+            {
+                _SearchClassNum = value;
+                RaisePropertyChanged(() => SearchClassNum);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-计划产量-开始时间
+        /// </summary>
+        private string _SearchStartTime;
+
+        public string SearchStartTime
+        {
+            get
+            {
+                return _SearchStartTime;
+            }
+            set
+            {
+                _SearchStartTime = value;
+                RaisePropertyChanged(() => SearchStartTime);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-计划产量-结束时间
+        /// </summary>
+        private string _SearchEndTime;
+
+        public string SearchEndTime
+        {
+            get
+            {
+                return _SearchEndTime;
+            }
+            set
+            {
+                _SearchEndTime = value;
+                RaisePropertyChanged(() => SearchEndTime);
+            }
+        }
+
+
+
+        #endregion
+
+        #region "属性"
+        /// <summary>
+        /// 工作时间属性
+        /// </summary>
+        private WorkTimeDto _FormWorkTimeDto;
+
+        public WorkTimeDto FormWorkTimeDto
+        {
+            get
+            {
+                return _FormWorkTimeDto;
+            }
+            set
+            {
+                _FormWorkTimeDto = value;
+                RaisePropertyChanged(() => FormWorkTimeDto);
+            }
+        }
+
+        /// <summary>
+        /// 计划产量属性
+        /// </summary>
+        private PlanCountDto _FormPlanCountDto;
+
+        public PlanCountDto FormPlanCountDto
+        {
+            get
+            {
+                return _FormPlanCountDto;
+            }
+            set
+            {
+                _FormPlanCountDto = value;
+                RaisePropertyChanged(() => FormPlanCountDto);
+            }
+        }
+
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        private int _CycleTime;
+
+        public int CycleTime
+        {
+            get
+            {
+                return _CycleTime;
+            }
+            set
+            {
+                _CycleTime = value;
+                RaisePropertyChanged(() => CycleTime);
+            }
+        }
+
+        private List<ComboBoxModel> _ClassNumComboBoxList;
+        /// <summary>
+        /// 班次下拉框列表
+        /// </summary>
+        public List<ComboBoxModel> ClassNumComboBoxList
+        {
+            get { return _ClassNumComboBoxList; }
+            set { _ClassNumComboBoxList = value; RaisePropertyChanged(() => ClassNumComboBoxList); }
+        }
+
+
+        /// <summary>
+        /// 工作时间Grid选中属性
+        /// </summary>
+        private WorkTimeDto _DgSelectedWorkTimeDto;
+
+        public WorkTimeDto DgSelectedWorkTimeDto
+        {
+            get
+            {
+                return _DgSelectedWorkTimeDto;
+            }
+            set
+            {
+                _DgSelectedWorkTimeDto = value;
+                RaisePropertyChanged(() => DgSelectedWorkTimeDto);
+            }
+        }
+
+        /// <summary>
+        /// 计划产量Grid选中属性
+        /// </summary>
+        private PlanCountDto _DgSelectedPlanCountDto;
+
+        public PlanCountDto DgSelectedPlanCountDto
+        {
+            get
+            {
+                return _DgSelectedPlanCountDto;
+            }
+            set
+            {
+                _DgSelectedPlanCountDto = value;
+                RaisePropertyChanged(() => DgSelectedPlanCountDto);
+            }
+        }
+
+        #endregion
+
+        #region "命令"
+
+        /// <summary>
+        /// 工作时间-搜索命令
+        /// </summary>
+        private RelayCommand _SearchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (_SearchCmd == null) return new RelayCommand(() => WorkTimeSearch());
+                return _SearchCmd;
+            }
+            set
+            {
+                _SearchCmd = value;
+            }
+        }
+
+        private void WorkTimeSearch()
+        {
+            try
+            {
+
+                var MulConQueryable = Fsql.Select<WorkTime>();
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchClassNum))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.ClassNum.Contains(SearchClassNum));
+                }
+
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListWorkTimeDto.Clear();
+
+                foreach (var item in ListDpI)
+                {
+                    ListWorkTimeDto.Add(new WorkTimeDto()
+                    {
+                        ID = item.Id,
+                        ClassNum = item.ClassNum,
+                        Index = item.IndexNum,
+                        EndTime = item.EndTime,
+                        StartTime = item.StartTime,
+                        CreateTime = item.CreateTime
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+
+        private void WorkTimeRefreshData()
+        {
+            try
+            {
+                var MulConQueryable = Fsql.Select<WorkTime>();
+
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListWorkTimeDto.Clear();
+
+                foreach (var item in ListDpI)
+                {
+                    ListWorkTimeDto.Add(new WorkTimeDto()
+                    {
+                        ID = item.Id,
+                        ClassNum = item.ClassNum,
+                        Index = item.IndexNum,
+                        EndTime = item.EndTime,
+                        StartTime = item.StartTime,
+                        CreateTime = item.CreateTime
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+
+
+        /// <summary>
+        /// 计划产量-搜索命令
+        /// </summary>
+        private RelayCommand _PlanCountSearchCmd;
+        public RelayCommand PlanCountSearchCmd
+        {
+            get
+            {
+                if (_PlanCountSearchCmd == null) return new RelayCommand(() => PlanCountSearch());
+                return _PlanCountSearchCmd;
+            }
+            set
+            {
+                _PlanCountSearchCmd = value;
+            }
+        }
+
+        private void PlanCountSearch()
+        {
+            try
+            {
+
+                var MulConQueryable = Fsql.Select<PlanCount>();
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartTime))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartTime));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndTime))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date <= Convert.ToDateTime(SearchEndTime).AddDays(1));
+                }
+
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListPlanCountDto.Clear();
+
+                foreach (var item in ListDpI)
+                {
+                    ListPlanCountDto.Add(new PlanCountDto()
+                    {
+                        ID = item.Id,
+                        ClassNum = item.ClassNum,
+                        AGroup = item.AGroup,
+                        BGroup = item.BGroup,
+                        CGroup = item.CGroup,
+                        PlanDate = item.PlanDate,
+                        CreateTime = item.CreateTime
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+
+        private void PlanCountRefreshData()
+        {
+            try
+            {
+
+                var MulConQueryable = Fsql.Select<PlanCount>();
+
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListPlanCountDto.Clear();
+
+                foreach (var item in ListDpI)
+                {
+                    ListPlanCountDto.Add(new PlanCountDto()
+                    {
+                        ID = item.Id,
+                        ClassNum = item.ClassNum,
+                        AGroup = item.AGroup,
+                        BGroup = item.BGroup,
+                        CGroup = item.CGroup,
+                        PlanDate = item.PlanDate,
+                        CreateTime = item.CreateTime
+                    });
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "Grid选中命令"
+        /// <summary>
+        /// Grid1选中命令
+        /// </summary>
+        private RelayCommand<DataGrid> _SelectedItemsCmd;
+
+        public RelayCommand<DataGrid> SelectedItemsCmd
+        {
+            get
+            {
+                if (_SelectedItemsCmd == null)
+                    _SelectedItemsCmd = new RelayCommand<DataGrid>((p) => SelectedItemData(p));
+                return _SelectedItemsCmd;
+            }
+            set { _SelectedItemsCmd = value; }
+        }
+
+        /// <summary>
+        /// 选中数据
+        /// </summary>
+        private void SelectedItemData(DataGrid dv)
+        {
+            if (dv.SelectedItems.Count > 0)
+            {
+                DgSelectedWorkTimeDto = (WorkTimeDto)dv.SelectedItems[0];
+            }
+        }
+
+
+
+
+        /// <summary>
+        /// Grid2选中命令
+        /// </summary>
+        private RelayCommand<DataGrid> _SelectedItemCmd;
+
+        public RelayCommand<DataGrid> SelectedItemCmd
+        {
+            get
+            {
+                if (_SelectedItemCmd == null)
+                    _SelectedItemCmd = new RelayCommand<DataGrid>((p) => SelectedIteData(p));
+                return _SelectedItemCmd;
+            }
+            set { _SelectedItemCmd = value; }
+        }
+
+        /// <summary>
+        /// 选中数据
+        /// </summary>
+        private void SelectedIteData(DataGrid dv)
+        {
+            if (dv.SelectedItems.Count > 0)
+            {
+                DgSelectedPlanCountDto = (PlanCountDto)dv.SelectedItems[0];
+            }
+        }
+        #endregion
+
+
+        #region "新增命令"
+
+        /// <summary>
+        /// 增加命令
+        /// </summary>
+        private RelayCommand _CreateFormCmd;
+        public RelayCommand CreateFormCmd
+        {
+            get
+            {
+                if (_CreateFormCmd == null) return new RelayCommand(() => CreateForm());
+                return _CreateFormCmd;
+            }
+
+            set
+            {
+                _CreateFormCmd = value;
+            }
+        }
+
+        private void CreateForm()
+        {
+            Messenger.Default.Send<String>("打开新增窗体数据", "Open_KanBan_WorkTimeCreate_CreateWindow");
+        }
+
+
+        /// <summary>
+        /// 增加命令
+        /// </summary>
+        private RelayCommand _CreateCmd;
+        public RelayCommand CreateCmd
+        {
+            get
+            {
+                if (_CreateCmd == null) return new RelayCommand(() => CreateData());
+                return _CreateCmd;
+            }
+
+            set
+            {
+                _CreateCmd = value;
+            }
+        }
+
+        /// <summary>
+        /// 增加表单数据
+        /// </summary>
+        private void CreateData()
+        {
+            try
+            {
+                if (FormWorkTimeDto.IsValidated)
+                {
+                    Fsql.Insert<WorkTime>(new WorkTime()
+                    {
+                        IndexNum = FormWorkTimeDto.Index,
+                        StartTime = FormWorkTimeDto.StartTime,
+                        EndTime = FormWorkTimeDto.EndTime,
+                        ClassNum = FormWorkTimeDto.ClassNum,
+                    }).ExecuteAffrows();
+
+                    //更新
+                    WorkTimeRefreshData();
+                    //FormWorkTimeDto.CreateTime = WorkTimeInfo.CreateTime;
+                    //FormWorkTimeDto.ID = WorkTimeInfo.ID;
+                    //ListWorkTimeDto.Insert(0, FormWorkTimeDto);
+
+                    //DailyParameterInfoDto = new DailyParameterInfoDto();
+                    Messenger.Default.Send<String>("关闭窗体", "CloseCurrentWindow");
+                    //MessageBox.Show("添加成功"); 
+                }
+                else
+                {
+                    //FormWorkTimeDto.IsFormValid = true;
+                    //var dataErrors = _dailyParameterInfoDto.dataErrors;
+                    MessageBox.Show("请检查数据是否正确输入或者有未填写数据");
+                };
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "新增命令-计划产量"
+
+        /// <summary>
+        /// 增加命令
+        /// </summary>
+        private RelayCommand _PlanCountCreateFormCmd;
+        public RelayCommand PlanCountCreateFormCmd
+        {
+            get
+            {
+                if (_PlanCountCreateFormCmd == null) return new RelayCommand(() => PlanCountCreateForm());
+                return _PlanCountCreateFormCmd;
+            }
+            set
+            {
+                _PlanCountCreateFormCmd = value;
+            }
+        }
+
+        private void PlanCountCreateForm()
+        {
+            FormPlanCountDto.PlanDate = DateTime.Now;
+            Messenger.Default.Send<String>("打开新增窗体数据", "Open_KanBan_PlanCountCreate_CreateWindow");
+        }
+
+        /// <summary>
+        /// 增加命令
+        /// </summary>
+        private RelayCommand _PlanCountCreateCmd;
+        public RelayCommand PlanCountCreateCmd
+        {
+            get
+            {
+                if (_PlanCountCreateCmd == null) return new RelayCommand(() => PlanCountCreateData());
+                return _PlanCountCreateCmd;
+            }
+            set
+            {
+                _PlanCountCreateCmd = value;
+            }
+        }
+
+        /// <summary>
+        /// 增加表单数据
+        /// </summary>
+        private void PlanCountCreateData()
+        {
+            try
+            {
+                if (FormPlanCountDto.IsValidated)
+                {
+                    Fsql.Insert<PlanCount>(new PlanCount()
+                    {
+                        AGroup = FormPlanCountDto.AGroup,
+                        BGroup = FormPlanCountDto.BGroup,
+                        CGroup = FormPlanCountDto.CGroup,
+                        ClassNum = FormPlanCountDto.ClassNum,
+                        PlanDate = FormPlanCountDto.PlanDate,
+                    }).ExecuteAffrows();
+
+                    //更新
+                    PlanCountRefreshData();
+                    //FormWorkTimeDto.CreateTime = WorkTimeInfo.CreateTime;
+                    //FormWorkTimeDto.ID = WorkTimeInfo.ID;
+                    //ListWorkTimeDto.Insert(0, FormWorkTimeDto);
+
+                    //DailyParameterInfoDto = new DailyParameterInfoDto();
+                    Messenger.Default.Send<String>("关闭窗体", "CloseCurrentWindow");
+                    //MessageBox.Show("添加成功"); 
+                }
+                else
+                {
+                    //FormWorkTimeDto.IsFormValid = true;
+                    //var dataErrors = _dailyParameterInfoDto.dataErrors;
+                    MessageBox.Show("请检查数据是否正确输入或者有未填写数据");
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "更新命令-计划产量"
+        /// <summary>
+        /// 修改数据命令
+        /// </summary>
+        private RelayCommand _PlanCountUpdateCmd;
+        public RelayCommand PlanCountUpdateCmd
+        {
+            get
+            {
+                if (_PlanCountUpdateCmd == null) return new RelayCommand(() => PlanCountUpdateValue());
+                return _PlanCountUpdateCmd;
+            }
+            set
+            {
+                _PlanCountUpdateCmd = value;
+            }
+        }
+
+        /// <summary>
+        /// 执行命令方法数据
+        /// </summary>
+        private void PlanCountUpdateValue()
+        {
+            try
+            {
+
+                if (DgSelectedPlanCountDto.IsValidated)
+                {
+                    //_DailyParameterInfoDataContext.Entities
+                    var dpi = Fsql.Update<PlanCount>()
+                        .Set(a => a.ClassNum, DgSelectedPlanCountDto.ClassNum)
+                        .Set(a => a.AGroup, DgSelectedPlanCountDto.AGroup)
+                        .Set(a => a.BGroup, DgSelectedPlanCountDto.BGroup)
+                        .Set(a => a.CGroup, DgSelectedPlanCountDto.CGroup)
+                        .Set(a => a.PlanDate, DgSelectedPlanCountDto.PlanDate)
+                        .Where(a => a.Id == DgSelectedPlanCountDto.ID)
+                        .ExecuteAffrows();
+
+                    //更新
+                    PlanCountRefreshData();
+
+                    //DailyParameterInfoDto = new DailyParameterInfoDto();
+                    Messenger.Default.Send<String>("关闭窗体", "CloseCurrentWindow");
+                    //MessageBox.Show("添加成功"); 
+                }
+                else
+                {
+                    //DgSelectedDailyParameterInfoDto.IsFormValid = true;
+                    //var dataErrors = DgSelectedDailyParameterInfoDto.dataErrors;
+                    MessageBox.Show("请检查数据是否正确输入或者有未填写数据");
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+
+        /// <summary>
+        /// 修改弹窗命令
+        /// </summary>
+        private RelayCommand _PlanCountUpdateFormCmd;
+
+        public RelayCommand PlanCountUpdateFormCmd
+        {
+            get
+            {
+                if (_PlanCountUpdateFormCmd == null) return new RelayCommand(() => PlanCountUpdateForm());
+                return _PlanCountUpdateFormCmd;
+            }
+            set { _PlanCountUpdateFormCmd = value; }
+        }
+
+        /// <summary>
+        /// 更新方法
+        /// </summary>
+        private void PlanCountUpdateForm()
+        {
+            if (DgSelectedPlanCountDto != null)
+            {
+                Messenger.Default.Send<String>("打开窗体", "Open_KanBan_PlanCountUpdate_UpdateWindow");
+            }
+            else
+            {
+                MessageBox.Show("请选中后再更新数据！", "提示", MessageBoxButton.OK);
+            }
+
+        }
+        #endregion
+
+        #region "更新命令"
+        /// <summary>
+        /// 修改数据命令
+        /// </summary>
+        private RelayCommand _UpdateCmd;
+        public RelayCommand UpdateCmd
+        {
+            get
+            {
+                if (_UpdateCmd == null) return new RelayCommand(() => UpdateValue());
+                return _UpdateCmd;
+            }
+            set
+            {
+                _UpdateCmd = value;
+            }
+        }
+
+        /// <summary>
+        /// 执行命令方法数据
+        /// </summary>
+        private void UpdateValue()
+        {
+            try
+            {
+                if (DgSelectedWorkTimeDto.IsValidated)
+                {
+                    //_DailyParameterInfoDataContext.Entities
+                    Fsql.Update<WorkTime>()
+                        .Set(a => a.IndexNum, DgSelectedWorkTimeDto.Index)
+                        .Set(a => a.ClassNum, DgSelectedWorkTimeDto.ClassNum)
+                        .Set(a => a.StartTime, DgSelectedWorkTimeDto.StartTime)
+                        .Set(a => a.EndTime, DgSelectedWorkTimeDto.EndTime)
+                        .Where(a => a.Id == DgSelectedWorkTimeDto.ID)
+                        .ExecuteAffrows();
+
+                    //更新
+                    WorkTimeRefreshData();
+
+                    //DailyParameterInfoDto = new DailyParameterInfoDto();
+                    Messenger.Default.Send<String>("关闭窗体", "CloseCurrentWindow");
+                    //MessageBox.Show("添加成功"); 
+                }
+                else
+                {
+                    //DgSelectedDailyParameterInfoDto.IsFormValid = true;
+                    //var dataErrors = DgSelectedDailyParameterInfoDto.dataErrors;
+                    MessageBox.Show("请检查数据是否正确输入或者有未填写数据");
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+
+        /// <summary>
+        /// 修改弹窗命令
+        /// </summary>
+        private RelayCommand _UpdateFormCmd;
+
+        public RelayCommand UpdateFormCmd
+        {
+            get
+            {
+                if (_UpdateFormCmd == null) return new RelayCommand(() => UpdateForm());
+                return _UpdateFormCmd;
+            }
+            set { _UpdateFormCmd = value; }
+        }
+
+        /// <summary>
+        /// 更新方法
+        /// </summary>
+        private void UpdateForm()
+        {
+            //DgSelectedWorkTimeDto.ID != null || DgSelectedWorkTimeDto.ID != Guid.Empty
+            if (DgSelectedWorkTimeDto != null)
+            {
+                Messenger.Default.Send<String>("打开窗体", "Open_KanBan_WorkTimeUpdate_UpdateWindow");
+            }
+            else
+            {
+                MessageBox.Show("请选中后再更新数据！", "提示", MessageBoxButton.OK);
+            }
+
+        }
+        #endregion
+
+        #region "删除命令-计划产量"
+        /// <summary>
+        /// 删除命令
+        /// </summary>
+        private RelayCommand _PlanCountDeleteFormCmd;
+        public RelayCommand PlanCountDeleteFormCmd
+        {
+            get
+            {
+                if (_PlanCountDeleteFormCmd == null) return new RelayCommand(() => PlanCountDeleteForm());
+                return _PlanCountDeleteFormCmd;
+            }
+            set
+            {
+                _PlanCountDeleteFormCmd = value;
+            }
+        }
+
+        private void PlanCountDeleteForm()
+        {
+
+            if (DgSelectedPlanCountDto.ID != null || DgSelectedPlanCountDto.ID != Guid.Empty)
+            {
+                MessageBoxResult result = MessageBox.Show("是否要删除当前数据！", "提示", MessageBoxButton.YesNo);
+                if (result == MessageBoxResult.Yes)
+                {
+                    var DeleteInfo = Fsql.Delete<PlanCount>().Where(a => a.Id == DgSelectedPlanCountDto.ID).ExecuteDeleted().FirstOrDefault();
+                    for (int i = 0; i < ListPlanCountDto.Count; i++)
+                    {
+                        if (DeleteInfo.Id == ListPlanCountDto[i].ID)
+                        {
+                            ListPlanCountDto.RemoveAt(i);
+                        }
+                    }
+                }
+                else
+                {
+                    // do something
+                }
+            }
+            else
+            {
+                MessageBox.Show("请选中后再删除！", "提示", MessageBoxButton.OK);
+            }
+
+        }
+        #endregion
+
+        #region "删除命令"
+        /// <summary>
+        /// 删除命令
+        /// </summary>
+        private RelayCommand _DeleteFormCmd;
+        public RelayCommand DeleteFormCmd
+        {
+            get
+            {
+                if (_DeleteFormCmd == null) return new RelayCommand(() => DeleteForm());
+                return _DeleteFormCmd;
+            }
+            set
+            {
+                _DeleteFormCmd = value;
+            }
+        }
+
+        private void DeleteForm()
+        {
+            try
+            {
+                if (DgSelectedWorkTimeDto != null || DgSelectedWorkTimeDto.ID != Guid.Empty)
+                {
+                    MessageBoxResult result = MessageBox.Show("是否要删除当前数据！", "提示", MessageBoxButton.YesNo);
+                    if (result == MessageBoxResult.Yes)
+                    {
+                        var DeleteInfo = Fsql.Delete<WorkTime>().Where(a => a.Id == DgSelectedWorkTimeDto.ID).ExecuteDeleted().FirstOrDefault();
+                        for (int i = 0; i < ListWorkTimeDto.Count; i++)
+                        {
+                            if (DeleteInfo.Id == ListPlanCountDto[i].ID)
+                            {
+                                ListWorkTimeDto.RemoveAt(i);
+                            }
+                        }
+
+                    }
+                    else
+                    {
+                        // do something
+                    }
+                }
+                else
+                {
+                    MessageBox.Show("请选中后再删除！", "提示", MessageBoxButton.OK);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+
+        }
+        #endregion
+        #region 全局命令
+
+
+
+        private RelayCommand cancelCmd;
+
+        public RelayCommand CancelCmd
+        {
+            get
+            {
+                if (cancelCmd == null) return new RelayCommand(() => CancelForm());
+                return cancelCmd;
+            }
+            set { cancelCmd = value; }
+        }
+        /// <summary>
+        /// 取消当前的窗口
+        /// </summary>
+        private void CancelForm()
+        {
+            FormWorkTimeDto = new WorkTimeDto();
+            DgSelectedWorkTimeDto = new WorkTimeDto();
+
+            FormPlanCountDto = new PlanCountDto();
+            DgSelectedPlanCountDto = new PlanCountDto();
+
+            Messenger.Default.Send<String>("关闭窗体", "CloseCurrentWindow");
+
+        }
+
+
+        private RelayCommand _CycleTimeTrue;
+
+        public RelayCommand CycleTimeTrue
+        {
+            get
+            {
+                if (_CycleTimeTrue == null) return new RelayCommand(() => CycleTimeTrueAction());
+                return _CycleTimeTrue;
+            }
+            set { _CycleTimeTrue = value; }
+        }
+
+
+        /// <summary>
+        /// 节拍时间保存
+        /// </summary>
+        private void CycleTimeTrueAction()
+        {
+            ConfigHelper.SetValue("CycleTime", CycleTime.ToString());
+
+        }
+
+        #endregion
+
+    }
+
+}
diff --git a/GroupLine.App/ViewModel/MagTorqueViewModel.cs b/GroupLine.App/ViewModel/MagTorqueViewModel.cs
new file mode 100644
index 0000000..ff81ad6
--- /dev/null
+++ b/GroupLine.App/ViewModel/MagTorqueViewModel.cs
@@ -0,0 +1,360 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class MagTorqueViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "磁束扭矩检";
+
+        private string CurrentMachineNameTemplate = "MagTorqueTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public MagTorqueViewModel()
+        {
+            ListModelDto = new ObservableCollection<MagTorqueDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<MagTorque, MagTorqueDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<MagTorqueDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<MagTorqueDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<MagTorque>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<MagTorqueDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].ModelType.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].MagValue.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].TorqueValue.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString(" yyyy - MM - dd HH: mm "));
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/MainViewModel.cs b/GroupLine.App/ViewModel/MainViewModel.cs
new file mode 100644
index 0000000..5936b0f
--- /dev/null
+++ b/GroupLine.App/ViewModel/MainViewModel.cs
@@ -0,0 +1,34 @@
+using GalaSoft.MvvmLight;
+
+namespace GroupLine.App.ViewModel
+{
+    /// <summary>
+    /// This class contains properties that the main View can data bind to.
+    /// <para>
+    /// Use the <strong>mvvminpc</strong> snippet to add bindable properties to this ViewModel.
+    /// </para>
+    /// <para>
+    /// You can also use Blend to data bind with the tool's support.
+    /// </para>
+    /// <para>
+    /// See http://www.galasoft.ch/mvvm
+    /// </para>
+    /// </summary>
+    public class MainViewModel : ViewModelBase
+    {
+        /// <summary>
+        /// Initializes a new instance of the MainViewModel class.
+        /// </summary>
+        public MainViewModel()
+        {
+            ////if (IsInDesignMode)
+            ////{
+            ////    // Code runs in Blend --> create design time data.
+            ////}
+            ////else
+            ////{
+            ////    // Code runs "for real"
+            ////}
+        }
+    }
+}
\ No newline at end of file
diff --git a/GroupLine.App/ViewModel/OffsetConfigViewModel.cs b/GroupLine.App/ViewModel/OffsetConfigViewModel.cs
new file mode 100644
index 0000000..b36da0d
--- /dev/null
+++ b/GroupLine.App/ViewModel/OffsetConfigViewModel.cs
@@ -0,0 +1,196 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.App.View;
+using GroupLine.Com;
+using GroupLine.Model;
+using NLog;
+using System;
+using System.Linq;
+using System.Windows;
+
+namespace GroupLine.App.ViewModel
+{
+    public class OffsetConfigViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "绝缘垫CCD";
+
+        private string CurrentMachineNameTemplate = "InsulationPadTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+
+
+        public OffsetConfigViewModel()
+        {
+            try
+            {
+                //获取程序的配置信息
+                var SqlCon = ConfigHelper.GetValue("connecting");
+
+
+
+                offsetConfig = FSqlContext.FDb.Select<OffsetConfig>().OrderByDescending(a => a.CreateTime).ToList().FirstOrDefault();
+                if (offsetConfig != null)
+                {
+
+                    AGroupOffsetCount = offsetConfig.AGroupOffsetCount;
+                    BGroupOffsetCount = offsetConfig.BGroupOffsetCount;
+                    CGroupOffsetCount = offsetConfig.CGroupOffsetCount;
+                }
+
+
+
+
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        public OffsetConfig offsetConfig { set; get; }
+
+
+
+        /// <summary>
+        /// 前组
+        /// </summary>
+        private int _AGroupOffsetCount;
+
+        public int AGroupOffsetCount
+        {
+            get
+            {
+                return _AGroupOffsetCount;
+            }
+            set
+            {
+                _AGroupOffsetCount = value;
+                RaisePropertyChanged(() => AGroupOffsetCount);
+            }
+        }
+
+        /// <summary>
+        /// 后组
+        /// </summary>
+        private int _BGroupOffsetCount;
+
+        public int BGroupOffsetCount
+        {
+            get
+            {
+                return _BGroupOffsetCount;
+            }
+            set
+            {
+                _BGroupOffsetCount = value;
+                RaisePropertyChanged(() => BGroupOffsetCount);
+            }
+
+        }
+
+        /// <summary>
+        /// 完成
+        /// </summary>
+        private int _CGroupOffsetCount;
+
+        public int CGroupOffsetCount
+        {
+            get
+            {
+                return _CGroupOffsetCount;
+            }
+            set
+            {
+                _CGroupOffsetCount = value;
+                RaisePropertyChanged(() => CGroupOffsetCount);
+            }
+
+        }
+
+
+        #region 命令
+        /// <summary>
+        /// 改为理论稼动率的设置了
+        /// </summary>
+        private RelayCommand _OffsetCmd;
+
+        public RelayCommand OffsetCmd
+        {
+            get
+            {
+                if (_OffsetCmd == null) return new RelayCommand(() => CycleTimeCmdAction());
+                return _OffsetCmd;
+            }
+            set { _OffsetCmd = value; }
+        }
+
+
+        /// <summary>
+        /// 配置保存
+        /// </summary>
+        private void CycleTimeCmdAction()
+        {
+            try
+            {
+                InputMsg = string.Empty;
+
+                MsgInput frm = new MsgInput();
+                frm.Accept += Frm_Accept;
+                frm.ShowDialog();
+
+                if (!string.IsNullOrEmpty(InputMsg))
+                {
+                    if (InputMsg == "admin123")
+                    {
+                        //ConfigHelper.SetValue("CycleTime", CycleTime.ToString());
+                        var data = FSqlContext.FDb.Update<OffsetConfig>()
+                             .Set(a => a.AGroupOffsetCount, AGroupOffsetCount)
+                             .Set(a => a.BGroupOffsetCount, BGroupOffsetCount)
+                             .Set(a => a.CGroupOffsetCount, CGroupOffsetCount)
+                             .Where(a => a.Id == 1)
+                             .ExecuteAffrows();
+
+                        //var GetFirstData = FSqlContext.FDb.Select<OffsetConfig>().OrderByDescending(a => a.CreateTime).ToList().FirstOrDefault();
+                        //GetFirstData.AGroupOffsetCount = AGroupOffsetCount;
+                        //GetFirstData.BGroupOffsetCount = BGroupOffsetCount;
+                        //GetFirstData.CGroupOffsetCount = CGroupOffsetCount;
+                        //_OffsetConfigDataContext.SubmitChanges();
+
+                        MessageBox.Show("修改成功数据", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+                    else
+                    {
+                        MessageBox.Show("密码错误", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                    }
+
+                }
+                else
+                {
+                    MessageBox.Show("未发现输入数据", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+
+        }
+
+        private string InputMsg { set; get; }
+
+        private void Frm_Accept(object sender, EventArgs e)
+        {
+            var data = (MsgInput)sender;
+            InputMsg = data.Box.Text;
+        }
+
+        #endregion
+    }
+
+}
diff --git a/GroupLine.App/ViewModel/OilPumpInstallViewModel.cs b/GroupLine.App/ViewModel/OilPumpInstallViewModel.cs
new file mode 100644
index 0000000..ba98564
--- /dev/null
+++ b/GroupLine.App/ViewModel/OilPumpInstallViewModel.cs
@@ -0,0 +1,363 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class OilPumpInstallViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "油泵安装";
+
+        private string CurrentMachineNameTemplate = "OilPumpInstallTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public OilPumpInstallViewModel()
+        {
+            ListModelDto = new ObservableCollection<OilPumpInstallDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<OilPumpInstall, OilPumpInstallDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<OilPumpInstallDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<OilPumpInstallDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<OilPumpInstall>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<OilPumpInstallDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].ModelType.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].OilPumpNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].OilPumpDmge.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].Repair.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].CreateTime.ToString(" yyyy - MM - dd HH: mm "));
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(7).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/OverflowLeakMesViewModel.cs b/GroupLine.App/ViewModel/OverflowLeakMesViewModel.cs
new file mode 100644
index 0000000..2e95555
--- /dev/null
+++ b/GroupLine.App/ViewModel/OverflowLeakMesViewModel.cs
@@ -0,0 +1,372 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class OverflowLeakMesViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "溢流阀安装泄露检查";
+
+        private string CurrentMachineNameTemplate = "OverflowLeakMesTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public OverflowLeakMesViewModel()
+        {
+            ListModelDto = new ObservableCollection<OverflowLeakMesDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<OverflowLeakMes, OverflowLeakMesDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<OverflowLeakMesDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<OverflowLeakMesDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<OverflowLeakMes>();
+
+                ////多条件查询
+                //if (!string.IsNullOrEmpty(SearchCylinderNo))
+                //{
+                //    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                //}
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<OverflowLeakMesDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].MachineCode.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].DynaDiskNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].StaticDiskNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].Cycle.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].ScrewCount.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].OverflowTorque.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].FinalAngle.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].OverflowTorque2.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].FinalAngle2.ToString());
+                        row.CreateCell(10).SetCellValue(ListData[i].OverflowTorque3.ToString());
+                        row.CreateCell(11).SetCellValue(ListData[i].FinalAngle3.ToString());
+                        row.CreateCell(12).SetCellValue(ListData[i].OverflowTorque4.ToString());
+                        row.CreateCell(13).SetCellValue(ListData[i].FinalAngle4.ToString());
+                        row.CreateCell(14).SetCellValue(ListData[i].Result.ToString());
+                        row.CreateCell(15).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(15).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/PCoreMesViewModel.cs b/GroupLine.App/ViewModel/PCoreMesViewModel.cs
new file mode 100644
index 0000000..c405717
--- /dev/null
+++ b/GroupLine.App/ViewModel/PCoreMesViewModel.cs
@@ -0,0 +1,360 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class PCoreMesViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "小P芯出测定";
+
+        private string CurrentMachineNameTemplate = "PCoreMesTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public PCoreMesViewModel()
+        {
+            ListModelDto = new ObservableCollection<PCoreMesDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<PCoreMes, PCoreMesDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<PCoreMesDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<PCoreMesDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<PCoreMes>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<PCoreMesDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].CoreOutput.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(3).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/PLowWeldViewModel.cs b/GroupLine.App/ViewModel/PLowWeldViewModel.cs
new file mode 100644
index 0000000..ae3a556
--- /dev/null
+++ b/GroupLine.App/ViewModel/PLowWeldViewModel.cs
@@ -0,0 +1,366 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class PLowWeldViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "小P下部焊接";
+
+        private string CurrentMachineNameTemplate = "PLowWeldTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public PLowWeldViewModel()
+        {
+            ListModelDto = new ObservableCollection<PLowWeldDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<PLowWeld, PLowWeldDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<PLowWeldDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<PLowWeldDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<PLowWeld>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<PLowWeldDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].CrankshaftNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].DownNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].DoCastNo.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].StatorPressDep.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].RotorPressDep.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].FelerGgeResult.ToString());
+                        row.CreateCell(7).SetCellValue(ListData[i].MagnetResult.ToString());
+                        row.CreateCell(8).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(9).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(9).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/PRacktPressViewModel.cs b/GroupLine.App/ViewModel/PRacktPressViewModel.cs
new file mode 100644
index 0000000..eaf4a5d
--- /dev/null
+++ b/GroupLine.App/ViewModel/PRacktPressViewModel.cs
@@ -0,0 +1,362 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class PRacktPressViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "小P支架压入";
+
+        private string CurrentMachineNameTemplate = "PRacktPressTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public PRacktPressViewModel()
+        {
+            ListModelDto = new ObservableCollection<PRacktPressDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<PRacktPress, PRacktPressDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<PRacktPressDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<PRacktPressDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<PRacktPress>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<PRacktPressDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].RacktNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].PressValue.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].TrayNo.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/PRacktWeldViewModel.cs b/GroupLine.App/ViewModel/PRacktWeldViewModel.cs
new file mode 100644
index 0000000..7eaca72
--- /dev/null
+++ b/GroupLine.App/ViewModel/PRacktWeldViewModel.cs
@@ -0,0 +1,360 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class PRacktWeldViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "小P支架焊接";
+
+        private string CurrentMachineNameTemplate = "PRacktWeldTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public PRacktWeldViewModel()
+        {
+            ListModelDto = new ObservableCollection<PRacktWeldDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<PRacktWeld, PRacktWeldDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<PRacktWeldDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<PRacktWeldDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<PRacktWeld>();
+
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchCylinderNo))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<PRacktWeldDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].CylinderNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].TrayNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(3).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/ReportTimeConfigViewModel.cs b/GroupLine.App/ViewModel/ReportTimeConfigViewModel.cs
new file mode 100644
index 0000000..9825311
--- /dev/null
+++ b/GroupLine.App/ViewModel/ReportTimeConfigViewModel.cs
@@ -0,0 +1,190 @@
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Com;
+using GroupLine.Model;
+using NLog;
+using System;
+using System.Linq;
+
+namespace GroupLine.App.ViewModel
+{
+    public class ReportTimeConfigViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        /// <summary>
+        /// 当前程序的位置
+        /// </summary>
+        private string Location;
+
+        private string CurrentRegion = "前组";
+        private string CurrentCategory = "报表信息";
+        private string CurrentReportTimeName = "导出时间";
+
+        //private string CurrentMachineNameTemplate = "H_RobotHandTemplate.xlsx";
+
+        public delegate void PubReportTime(string ReportInfo);
+
+        public static event PubReportTime PubReportTimeEvent;
+
+        //private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public ReportTimeConfigViewModel()
+        {
+            //SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            //SearchEndDate = DateTime.Now.AddDays(10).ToShortDateString();
+
+            Location = ConfigHelper.GetValue("Location");
+
+            if (Location == "1")
+            {
+                CurrentRegion = "前组";
+            }
+            else
+            {
+                CurrentRegion = "后组";
+            }
+
+            //var config = new MapperConfiguration(cfg => cfg.CreateMap<H_RobotHand, H_RobotHandDto>());
+            //autoMapper = config.CreateMapper();
+
+            var ConfigInfo = FSqlContext.FDb.Select<SystemConfig>().Where(a => a.Region == CurrentRegion && a.Category == CurrentCategory && a.Name == CurrentReportTimeName).ToList();
+            if (ConfigInfo != null && ConfigInfo.Count() > 0)
+            {
+                DayReportTime = ConfigInfo.FirstOrDefault().Value;
+            }
+            else
+            {
+                DayReportTime = "";
+            }
+        }
+
+
+        ///// <summary>
+        ///// 列表集合
+        ///// </summary>
+        //private ObservableCollection<H_RobotHandDto> _ListH_RobotHandDto;
+        ///// <summary>
+        ///// 列表集合
+        ///// </summary>
+        //public ObservableCollection<H_RobotHandDto> ListH_RobotHandDto
+        //{
+        //    get { return _ListH_RobotHandDto; }
+        //    set { _ListH_RobotHandDto = value; }
+        //}
+
+        #region "属性"
+
+        /// <summary>
+        /// 每日导出时间
+        /// </summary>
+        private string dayReportTime;
+        public string DayReportTime
+        {
+            get { return dayReportTime; }
+            set { dayReportTime = value; RaisePropertyChanged(() => DayReportTime); }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand saveCmd;
+        public RelayCommand SaveCmd
+        {
+            get
+            {
+                if (saveCmd == null) return new RelayCommand(() => Save());
+                return saveCmd;
+            }
+            set
+            {
+                saveCmd = value;
+            }
+        }
+
+        private void Save()
+        {
+            try
+            {
+                //发布报表信息
+                PubReportTimeEvent(DayReportTime);
+
+                var ReportConfig = FSqlContext.FDb.Select<SystemConfig>().Where(a => a.Region == CurrentRegion && a.Category == CurrentCategory && a.Name == "导出时间").OrderByDescending(a => a.CreateTime).ToList();
+                if (ReportConfig != null && ReportConfig.Count > 0)
+                {
+                    FSqlContext.FDb.Update<SystemConfig>(ReportConfig.FirstOrDefault().Id)
+                         //.Set(a => a.CreateTime, DateTime.Now)// FreeSQL会自动更新时间
+                         .Set(a => a.Value, DayReportTime)
+                         .ExecuteAffrows();
+                }
+                else
+                {
+                    FSqlContext.FDb.Insert<SystemConfig>(new SystemConfig()
+                    {
+                        Region = CurrentRegion,
+                        Category = CurrentCategory,
+                        Name = CurrentReportTimeName,
+                        Value = DayReportTime,
+                    }).ExecuteAffrows();
+                }
+
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/StaticDiscPressViewModel.cs b/GroupLine.App/ViewModel/StaticDiscPressViewModel.cs
new file mode 100644
index 0000000..2806c50
--- /dev/null
+++ b/GroupLine.App/ViewModel/StaticDiscPressViewModel.cs
@@ -0,0 +1,362 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class StaticDiscPressViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "静盘注液阀压入";
+
+        private string CurrentMachineNameTemplate = "StaticDiscPressTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public StaticDiscPressViewModel()
+        {
+            ListModelDto = new ObservableCollection<StaticDiscPressDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<StaticDiscPress, StaticDiscPressDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<StaticDiscPressDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<StaticDiscPressDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<StaticDiscPress>();
+
+                //多条件查询
+                //if (!string.IsNullOrEmpty(SearchCylinderNo))
+                //{
+                //    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                //}
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<StaticDiscPressDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].StaticDiskNo.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].PressValue.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].PressDepth.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].PressStation.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(5).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/SubItem.cs b/GroupLine.App/ViewModel/SubItem.cs
new file mode 100644
index 0000000..5f69e55
--- /dev/null
+++ b/GroupLine.App/ViewModel/SubItem.cs
@@ -0,0 +1,16 @@
+using System.Windows.Controls;
+
+namespace GroupLine.App.ViewModel
+{
+    public class SubItem
+    {
+        public SubItem(string name, UserControl screen = null)
+        {
+            Name = name;
+            Screen = screen;
+        }
+        public string Name { get; private set; }
+        public UserControl Screen { get; private set; }
+
+    }
+}
diff --git a/GroupLine.App/ViewModel/TermWeldViewModel.cs b/GroupLine.App/ViewModel/TermWeldViewModel.cs
new file mode 100644
index 0000000..8f6339f
--- /dev/null
+++ b/GroupLine.App/ViewModel/TermWeldViewModel.cs
@@ -0,0 +1,363 @@
+using AutoMapper;
+using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
+using GroupLine.Model;
+using NLog;
+using NPOI.HSSF.Util;
+using NPOI.SS.UserModel;
+using NPOI.XSSF.UserModel;
+using System;
+using System.Collections.ObjectModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Forms;
+using MessageBox = System.Windows.MessageBox;
+using GroupLine.App.ModelDto;
+
+namespace GroupLine.App.ViewModel
+{
+    public class TermWeldViewModel : ViewModelBase
+    {
+        //日志的实例化
+        private static Logger _Logger = LogManager.GetCurrentClassLogger();
+
+        private string CurrentMachineName = "端子凸焊";
+
+        private string CurrentMachineNameTemplate = "TermWeldTemplate.xlsx";
+
+        private IMapper autoMapper;
+
+        /// <summary>
+        /// 实例化函数
+        /// </summary>
+        public TermWeldViewModel()
+        {
+            ListModelDto = new ObservableCollection<TermWeldDto>();
+            SearchStartDate = DateTime.Now.AddDays(-1).ToShortDateString();
+            SearchEndDate = DateTime.Now.AddDays(2).ToShortDateString();
+
+            MachineName = CurrentMachineName + " - 搜索条件";
+
+
+            var config = new MapperConfiguration(cfg => cfg.CreateMap<TermWeld, TermWeldDto>());
+            autoMapper = config.CreateMapper();
+        }
+
+
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        private ObservableCollection<TermWeldDto> _ListModelDto;
+        /// <summary>
+        /// 列表集合
+        /// </summary>
+        public ObservableCollection<TermWeldDto> ListModelDto
+        {
+            get { return _ListModelDto; }
+            set { _ListModelDto = value; }
+        }
+
+        #region "搜索条件属性"
+
+        /// <summary>
+        /// 机器设备名称
+        /// </summary>
+        private string machineName;
+
+        public string MachineName
+        {
+            get
+            {
+                return machineName;
+            }
+            set
+            {
+                machineName = value;
+                RaisePropertyChanged(() => MachineName);
+            }
+        }
+
+
+
+        /// <summary>
+        /// 搜索条件-背番号
+        /// </summary>
+        private string searchBackData;
+
+        public string SearchBackData
+        {
+            get
+            {
+                return searchBackData;
+            }
+            set
+            {
+                searchBackData = value;
+                RaisePropertyChanged(() => SearchBackData);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-筒体编号
+        /// </summary>
+        private string searchCylinderNo;
+
+        public string SearchCylinderNo
+        {
+            get
+            {
+                return searchCylinderNo;
+            }
+            set
+            {
+                searchCylinderNo = value;
+                RaisePropertyChanged(() => searchCylinderNo);
+            }
+        }
+
+
+        /// <summary>
+        /// 搜索条件-开始时间
+        /// </summary>
+        private string searchStartDate;
+
+        public string SearchStartDate
+        {
+            get
+            {
+                return searchStartDate;
+            }
+            set
+            {
+                searchStartDate = value;
+                RaisePropertyChanged(() => SearchStartDate);
+            }
+        }
+
+        /// <summary>
+        /// 搜索条件-结束时间
+        /// </summary>
+        private string searchEndDate;
+
+        public string SearchEndDate
+        {
+            get
+            {
+                return searchEndDate;
+            }
+
+            set
+            {
+                searchEndDate = value;
+                RaisePropertyChanged(() => SearchEndDate);
+            }
+        }
+        #endregion
+
+        #region "搜索命令"
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand searchCmd;
+        public RelayCommand SearchCmd
+        {
+            get
+            {
+                if (searchCmd == null) return new RelayCommand(() => Search());
+                return searchCmd;
+            }
+            set
+            {
+                searchCmd = value;
+            }
+        }
+
+        private void Search()
+        {
+            try
+            {
+                var MulConQueryable = FSqlContext.FDb.Select<TermWeld>();
+
+                ////多条件查询
+                //if (!string.IsNullOrEmpty(SearchCylinderNo))
+                //{
+                //    MulConQueryable = MulConQueryable.Where(t => t.CylinderNo.Contains(SearchCylinderNo));
+                //}
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchStartDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date >= Convert.ToDateTime(SearchStartDate));
+                }
+                //多条件查询
+                if (!string.IsNullOrEmpty(SearchEndDate))
+                {
+                    MulConQueryable = MulConQueryable.Where(t => t.CreateTime.Date < Convert.ToDateTime(SearchEndDate).AddDays(1));
+                }
+                var ListDpI = MulConQueryable.OrderByDescending(a => a.CreateTime).ToList();//.Where(a => a.CreateTime >= DateTime.Now);
+                ListModelDto.Clear();
+
+
+                foreach (var item in ListDpI)
+                {
+                    ListModelDto.Add(autoMapper.Map<TermWeldDto>(item));
+
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+        #endregion
+
+        #region "导出数据"
+        //OutputDataCmd
+
+        /// <summary>
+        /// 搜索命令
+        /// </summary>
+        private RelayCommand _OutputDataCmd;
+        public RelayCommand OutputDataCmd
+        {
+            get
+            {
+                if (_OutputDataCmd == null) return new RelayCommand(() => OutputDataAction());
+                return _OutputDataCmd;
+            }
+            set
+            {
+                _OutputDataCmd = value;
+            }
+        }
+
+        private void OutputDataAction()
+        {
+            try
+            {
+                if (ListModelDto != null && ListModelDto.Count > 0)
+                {
+                    string FilePath = string.Empty;
+                    FolderBrowserDialog dialog = new FolderBrowserDialog();
+                    dialog.Description = "请选择文件夹";
+                    dialog.ShowNewFolderButton = true;  // 显示 新建文件夹 按钮
+                                                        //dialog.SelectedPath = Environment.CurrentDirectory; // 设置 选择的路径 为 当前项目路径
+                    if (dialog.ShowDialog() == DialogResult.OK)
+                    {
+                        // 判空
+                        if (string.IsNullOrEmpty(dialog.SelectedPath)) { MessageBox.Show("文件夹路径不能为空", "温馨提示", MessageBoxButton.OK, MessageBoxImage.Information); return; }
+                        FilePath = dialog.SelectedPath;    // 获取 选择的 文件夹 路径
+                    }
+
+
+                    var ListData = ListModelDto.ToList();
+
+                    /***********************
+                  1.读取excel到workbook中
+                  ***********************/
+                    string TemplateFilePath = System.Environment.CurrentDirectory;
+                    string tPath = TemplateFilePath + @"\ReportFile\" + CurrentMachineNameTemplate;
+                    //string tPath = @"D:\ReportTemplate\注油Template.xlsx";
+                    XSSFWorkbook wk = null;
+                    using (FileStream fs = File.Open(tPath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+                    {
+                        wk = new XSSFWorkbook(fs);
+                        fs.Close();   //把excel里的内容保存到workbook中之后，就可以关闭了
+                    }
+                    NPOI.SS.UserModel.ISheet sheet = wk.GetSheetAt(0);   //获得wk中第一个sheet,保存到sheet中
+
+                    /***********************
+                    2.操作数据
+                    ***********************/
+                    //2行  5行
+                    IDataFormat dataformat = wk.CreateDataFormat();
+                    ICellStyle style0 = wk.CreateCellStyle();
+
+                    ICellStyle styleBag = wk.CreateCellStyle();
+                    styleBag.FillForegroundColor = HSSFColor.Red.Index;
+                    styleBag.FillPattern = FillPattern.SolidForeground;
+
+                    for (int i = 0; i < ListData.Count; i++)// (int i = 2; i < 6; i += 3)
+                    {
+                        IRow row;
+                        row = sheet.CreateRow(i + 1);
+
+                        row.CreateCell(0).SetCellValue(ListData[i].MachineModel.ToString());
+                        row.CreateCell(1).SetCellValue(ListData[i].WeldStation.ToString());
+                        row.CreateCell(2).SetCellValue(ListData[i].OpNo.ToString());
+                        row.CreateCell(3).SetCellValue(ListData[i].Cur.ToString());
+                        row.CreateCell(4).SetCellValue(ListData[i].ElectrodeModel.ToString());
+                        row.CreateCell(5).SetCellValue(ListData[i].WeldTime.ToString());
+                        row.CreateCell(6).SetCellValue(ListData[i].CreateTime.ToString("yyyy-MM-dd HH:mm"));
+
+
+                        //row.GetCell(10).CellStyle = style0;
+
+                        style0.DataFormat = dataformat.GetFormat("yyyy-MM-dd HH:mm:ss");
+                        row.GetCell(6).CellStyle = style0;
+                        //row.GetCell(26).CellStyle = style0;
+                        //if (ListDat[i].UpperGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(4).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].LowerGroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(6).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].GroupStandDiffResult == "NG")
+                        //{
+                        //    row.GetCell(8).CellStyle = styleBag;
+                        //}
+                        //if (ListDat[i].FillReal >= ListDat[i].BeforLow && ListDat[i].FillReal <= ListDat[i].BeforUp)
+                        //{
+
+                        //}
+                        //else
+                        //{
+                        //    row.GetCell(7).CellStyle = styleBag;
+                        //}
+
+                    }
+
+
+                    //DayDailyParameterInfo = null;
+                    //NightDailyParameterInfo = null;
+
+                    /***********************
+                 3.修改完成，写入到客户端 
+                 ***********************/
+                    using (System.IO.MemoryStream ms = new System.IO.MemoryStream())
+                    {
+                        //tPath = @"D:\日立报表\";
+                        //判断文件夹是否存在，不存在就创建
+                        if (!Directory.Exists(FilePath))
+                        {
+                            Directory.CreateDirectory(FilePath);
+                        }
+                        FilePath = FilePath + @"\" + Convert.ToDateTime(SearchStartDate).ToString("yyyy-MM-dd") + "-" + Convert.ToDateTime(searchEndDate).ToString("yyyy-MM-dd") + "-" + CurrentMachineName + ".xlsx";
+                        wk.Write(ms);
+
+                        using (FileStream fs = new FileStream(FilePath, FileMode.Create, FileAccess.Write))
+                        {
+                            byte[] data = ms.ToArray();
+                            fs.Write(data, 0, data.Length);
+                            fs.Flush();
+                        }
+                        wk = null;
+                    }
+                    System.Windows.MessageBox.Show("生成成功");
+                }
+                else
+                {
+                    MessageBox.Show("请先搜索数据后再导出", "提示", MessageBoxButton.OK, MessageBoxImage.Information);
+                }
+            }
+            catch (Exception ex)
+            {
+                _Logger.Error(String.Format("ErrSource : {0} ErrMsg : {1}", ex.StackTrace.ToString(), ex.Message.ToString()));
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/GroupLine.App/ViewModel/ViewModelLocator.cs b/GroupLine.App/ViewModel/ViewModelLocator.cs
new file mode 100644
index 0000000..c1e914d
--- /dev/null
+++ b/GroupLine.App/ViewModel/ViewModelLocator.cs
@@ -0,0 +1,480 @@
+/*
+  In App.xaml:
+  <Application.Resources>
+      <vm:ViewModelLocator xmlns:vm="clr-namespace:GroupLine.App"
+                           x:Key="Locator" />
+  </Application.Resources>
+  
+  In the View:
+  DataContext="{Binding Source={StaticResource Locator}, Path=ViewModelName}"
+
+  You can also use Blend to do all this with the tool's support.
+  See http://www.galasoft.ch/mvvm
+*/
+
+using CommonServiceLocator;
+using GalaSoft.MvvmLight.Ioc;
+using GroupLine.App.ViewModel;
+using GroupLine.Model;
+using YC5.App.ViewModel;
+
+namespace GroupLine.App.ViewModel
+{
+    /// <summary>
+    /// This class contains static references to all the view models in the
+    /// application and provides an entry point for the bindings.
+    /// </summary>
+    public class ViewModelLocator
+    {
+        /// <summary>
+        /// Initializes a new instance of the ViewModelLocator class.
+        /// </summary>
+        public ViewModelLocator()
+        {
+            ServiceLocator.SetLocatorProvider(() => SimpleIoc.Default);
+            SimpleIoc.Default.Register<AppearanceTestViewModel>();
+
+            SimpleIoc.Default.Register<KanBanViewModel>();
+            SimpleIoc.Default.Register<OffsetConfigViewModel>();
+
+
+            SimpleIoc.Default.Register<MagTorqueViewModel>();
+            SimpleIoc.Default.Register<OilPumpInstallViewModel>();
+            SimpleIoc.Default.Register<DbDataClearViewModel>();
+
+
+            SimpleIoc.Default.Register<CylinderEngravViewModel>();
+            SimpleIoc.Default.Register<TermWeldViewModel>();
+            SimpleIoc.Default.Register<GCylinderBurnEbViewModel>();
+            SimpleIoc.Default.Register<GRotorBurnEbViewModel>();
+            SimpleIoc.Default.Register<GRotorMagViewModel>();
+            SimpleIoc.Default.Register<GInsRotaResViewModel>();
+            SimpleIoc.Default.Register<PRacktPressViewModel>();
+            SimpleIoc.Default.Register<PRacktWeldViewModel>();
+            SimpleIoc.Default.Register<PLowWeldViewModel>();
+            SimpleIoc.Default.Register<PCoreMesViewModel>();
+            SimpleIoc.Default.Register<GMagTorqueViewModel>();
+            SimpleIoc.Default.Register<KPMagTorqueViewModel>();
+            SimpleIoc.Default.Register<GOilPumpInstallViewModel>();
+            SimpleIoc.Default.Register<KPOilPumpInstallViewModel>();
+            SimpleIoc.Default.Register<GCDTransplantViewModel>();
+            SimpleIoc.Default.Register<KPCDTransplantViewModel>();
+            SimpleIoc.Default.Register<GLeakCheckViewModel>();
+            SimpleIoc.Default.Register<KPLeakCheckViewModel>();
+            SimpleIoc.Default.Register<KPSealInstallViewModel>();
+            SimpleIoc.Default.Register<ExhInstallMesViewModel>();
+            SimpleIoc.Default.Register<BurPlugInstallViewModel>();
+            SimpleIoc.Default.Register<OverflowLeakMesViewModel>();
+            SimpleIoc.Default.Register<StaticDiscPressViewModel>();
+            SimpleIoc.Default.Register<GDynStaticMachViewModel>();
+            SimpleIoc.Default.Register<KPDynStaticMachViewModel>();
+            SimpleIoc.Default.Register<GLowVolStartViewModel>();
+            SimpleIoc.Default.Register<KPLowVolStartViewModel>();
+            SimpleIoc.Default.Register<GSpotWeldMachViewModel>();
+            SimpleIoc.Default.Register<KPSpotWeldMachViewModel>();
+            SimpleIoc.Default.Register<GRingWeldMachViewModel>();
+            SimpleIoc.Default.Register<KPRingWeldMachViewModel>();
+            SimpleIoc.Default.Register<GShrinkTubViewModel>();
+            SimpleIoc.Default.Register<GStaticDiskMachViewModel>();
+            SimpleIoc.Default.Register<KPStaticDiskMachViewModel>();
+            SimpleIoc.Default.Register<KPUpBurnEbViewModel>();
+
+            SimpleIoc.Default.Register<KPRingWeldMachDwViewModel>();
+            SimpleIoc.Default.Register<KPRingWeldMachUpViewModel>();
+            SimpleIoc.Default.Register<KPShrinkTubViewModel>();
+
+
+            ////if (ViewModelBase.IsInDesignModeStatic)
+            ////{
+            ////    // Create design time view services and models
+            ////    SimpleIoc.Default.Register<IDataService, DesignDataService>();
+            ////}
+            ////else
+            ////{
+            ////    // Create run time view services and models
+            ////    SimpleIoc.Default.Register<IDataService, DataService>();
+            ////}
+
+            SimpleIoc.Default.Register<MainViewModel>();
+
+
+
+            SimpleIoc.Default.Register<ReportTimeConfigViewModel>();
+
+        }
+
+        public MainViewModel Main
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MainViewModel>();
+            }
+        }
+
+        public ReportTimeConfigViewModel ReportTimeConfig
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ReportTimeConfigViewModel>();
+            }
+        }
+
+        public AppearanceTestViewModel AppearanceTest
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<AppearanceTestViewModel>();
+            }
+        }
+
+
+        public OffsetConfigViewModel OffsetConfig
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<OffsetConfigViewModel>();
+            }
+        }
+
+
+        public KanBanViewModel KanBan
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KanBanViewModel>();
+            }
+        }
+
+        public MagTorqueViewModel MagTorque
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<MagTorqueViewModel>();
+            }
+        }
+
+        public OilPumpInstallViewModel OilPumpInstall
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<OilPumpInstallViewModel>();
+            }
+        }
+
+        public DbDataClearViewModel DbDataClear
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<DbDataClearViewModel>();
+            }
+        }
+
+        public CylinderEngravViewModel CylinderEngrav
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<CylinderEngravViewModel>();
+            }
+        }
+
+        public TermWeldViewModel TermWeld
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<TermWeldViewModel>();
+            }
+        }
+
+        public GCylinderBurnEbViewModel GCylinderBurnEb
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GCylinderBurnEbViewModel>();
+            }
+        }
+
+        public GRotorBurnEbViewModel GRotorBurnEb
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GRotorBurnEbViewModel>();
+            }
+        }
+
+        public GRotorMagViewModel GRotorMag
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GRotorMagViewModel>();
+            }
+        }
+
+        public GInsRotaResViewModel GInsRotaRes
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GInsRotaResViewModel>();
+            }
+        }
+
+        public PRacktPressViewModel PRacktPress
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<PRacktPressViewModel>();
+            }
+        }
+
+        public PRacktWeldViewModel PRacktWeld
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<PRacktWeldViewModel>();
+            }
+        }
+
+        public PLowWeldViewModel PLowWeld
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<PLowWeldViewModel>();
+            }
+        }
+
+        public PCoreMesViewModel PCoreMes
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<PCoreMesViewModel>();
+            }
+        }
+
+        public GMagTorqueViewModel GMagTorque
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GMagTorqueViewModel>();
+            }
+        }
+
+        public KPMagTorqueViewModel KPMagTorque
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPMagTorqueViewModel>();
+            }
+        }
+
+        public GOilPumpInstallViewModel GOilPumpInstall
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GOilPumpInstallViewModel>();
+            }
+        }
+
+        public KPOilPumpInstallViewModel KPOilPumpInstall
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPOilPumpInstallViewModel>();
+            }
+        }
+
+        public GCDTransplantViewModel GCDTransplant
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GCDTransplantViewModel>();
+            }
+        }
+
+        public KPCDTransplantViewModel KPCDTransplant
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPCDTransplantViewModel>();
+            }
+        }
+
+        public GLeakCheckViewModel GLeakCheck
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GLeakCheckViewModel>();
+            }
+        }
+
+        public KPLeakCheckViewModel KPLeakCheck
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPLeakCheckViewModel>();
+            }
+        }
+
+        public KPSealInstallViewModel KPSealInstall
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPSealInstallViewModel>();
+            }
+        }
+
+        public ExhInstallMesViewModel ExhInstallMes
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<ExhInstallMesViewModel>();
+            }
+        }
+
+        public BurPlugInstallViewModel BurPlugInstall
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<BurPlugInstallViewModel>();
+            }
+        }
+
+        public OverflowLeakMesViewModel OverflowLeakMes
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<OverflowLeakMesViewModel>();
+            }
+        }
+
+        public StaticDiscPressViewModel StaticDiscPress
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<StaticDiscPressViewModel>();
+            }
+        }
+
+        public GDynStaticMachViewModel GDynStaticMach
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GDynStaticMachViewModel>();
+            }
+        }
+
+        public KPDynStaticMachViewModel KPDynStaticMach
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPDynStaticMachViewModel>();
+            }
+        }
+
+        public GLowVolStartViewModel GLowVolStart
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GLowVolStartViewModel>();
+            }
+        }
+
+        public KPLowVolStartViewModel KPLowVolStart
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPLowVolStartViewModel>();
+            }
+        }
+
+        public GSpotWeldMachViewModel GSpotWeldMach
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GSpotWeldMachViewModel>();
+            }
+        }
+
+        public KPSpotWeldMachViewModel KPSpotWeldMach
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPSpotWeldMachViewModel>();
+            }
+        }
+
+        public GRingWeldMachViewModel GRingWeldMach
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GRingWeldMachViewModel>();
+            }
+        }
+
+        public KPRingWeldMachViewModel KPRingWeldMach
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPRingWeldMachViewModel>();
+            }
+        }
+
+        public GShrinkTubViewModel GShrinkTub
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GShrinkTubViewModel>();
+            }
+        }
+
+        public GStaticDiskMachViewModel GStaticDiskMach
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<GStaticDiskMachViewModel>();
+            }
+        }
+
+        public KPStaticDiskMachViewModel KPStaticDiskMach
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPStaticDiskMachViewModel>();
+            }
+        }
+
+        public KPUpBurnEbViewModel KPUpBurnEb
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPUpBurnEbViewModel>();
+            }
+        }
+
+
+        public KPRingWeldMachDwViewModel KPRingWeldMachDw
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPRingWeldMachDwViewModel>();
+            }
+        }
+        public KPRingWeldMachUpViewModel KPRingWeldMachUp
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPRingWeldMachUpViewModel>();
+            }
+        }
+        public KPShrinkTubViewModel KPShrinkTub
+        {
+            get
+            {
+                return ServiceLocator.Current.GetInstance<KPShrinkTubViewModel>();
+            }
+        }
+
+        public static void Cleanup()
+        {
+            // TODO Clear the ViewModels
+        }
+    }
+}
\ No newline at end of file
diff --git a/GroupLine.App/packages.config b/GroupLine.App/packages.config
new file mode 100644
index 0000000..914a7e3
--- /dev/null
+++ b/GroupLine.App/packages.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="AutoMapper" version="8.0.0" targetFramework="net461" />
+  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net461" />
+  <package id="FreeSql" version="3.2.692" targetFramework="net461" />
+  <package id="FreeSql.Provider.SqlServer" version="3.2.692" targetFramework="net461" />
+  <package id="MaterialDesignColors" version="2.0.4" targetFramework="net461" />
+  <package id="MaterialDesignThemes" version="4.1.0" targetFramework="net461" />
+  <package id="MvvmLight" version="5.4.1.1" targetFramework="net461" />
+  <package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net461" />
+  <package id="NLog" version="5.1.2" targetFramework="net461" />
+  <package id="NLog.Config" version="4.7.15" targetFramework="net461" />
+  <package id="NLog.Schema" version="4.7.15" targetFramework="net461" />
+  <package id="NPOI" version="2.5.5" targetFramework="net461" />
+  <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
+  <package id="SharpZipLib" version="1.3.2" targetFramework="net461" />
+  <package id="System.Data.SqlClient" version="4.8.5" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/GroupLine.Com/ConfigHelper.cs b/GroupLine.Com/ConfigHelper.cs
new file mode 100644
index 0000000..7f82391
--- /dev/null
+++ b/GroupLine.Com/ConfigHelper.cs
@@ -0,0 +1,55 @@
+using System.Configuration;
+
+namespace GroupLine.Com
+{
+    public class ConfigHelper
+    {
+        Configuration cfa = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+
+        /// <summary>
+        /// 根据Key取Value值
+        /// </summary>
+        /// <param name="key"></param>
+        public static string GetValue(string key)
+        {
+            return ConfigurationManager.AppSettings[key].ToString().Trim();
+        }
+
+        /// <summary>
+        /// 根据Key修改Value
+        /// </summary>
+        /// <param name="key">要修改的Key</param>
+        /// <param name="value">要修改为的值</param>
+        public static void SetValue(string key, string value)
+        {
+            //ConfigurationManager.AppSettings.Set(key, value);
+            //cfa.AppSettings.Settings[key].Value = value;
+            //cfa.Save();
+
+            Configuration configuration = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
+            configuration.AppSettings.Settings[key].Value = value;
+            configuration.Save();
+            ConfigurationManager.RefreshSection("appSettings");
+        }
+
+        /// <summary>
+        /// 添加新的Key ，Value键值对
+        /// </summary>
+        /// <param name="key">Key</param>
+        /// <param name="value">Value</param>
+        public static void Add(string key, string value)
+        {
+            ConfigurationManager.AppSettings.Add(key, value);
+        }
+
+        /// <summary>
+        /// 根据Key删除项
+        /// </summary>
+        /// <param name="key">Key</param>
+        public static void Remove(string key)
+        {
+            ConfigurationManager.AppSettings.Remove(key);
+        }
+
+    }
+}
diff --git a/GroupLine.Com/GroupLine.Com.csproj b/GroupLine.Com/GroupLine.Com.csproj
new file mode 100644
index 0000000..37dc356
--- /dev/null
+++ b/GroupLine.Com/GroupLine.Com.csproj
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{D952EFF3-E90D-48CE-92E5-76E1BA4AB609}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>GroupLine.Com</RootNamespace>
+    <AssemblyName>GroupLine.Com</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ConfigHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/GroupLine.Com/Properties/AssemblyInfo.cs b/GroupLine.Com/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..778ae45
--- /dev/null
+++ b/GroupLine.Com/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("GroupLine.Com")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HP Inc.")]
+[assembly: AssemblyProduct("GroupLine.Com")]
+[assembly: AssemblyCopyright("Copyright © HP Inc. 2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("d952eff3-e90d-48ce-92e5-76e1ba4ab609")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/GroupLine.Model/AppearanceTest.cs b/GroupLine.Model/AppearanceTest.cs
new file mode 100644
index 0000000..469f3fe
--- /dev/null
+++ b/GroupLine.Model/AppearanceTest.cs
@@ -0,0 +1,130 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 外观检查
+    /// </summary>
+    [Table(Name = "dbo.AppearanceTest")]
+    public class AppearanceTest
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+
+
+        /// <summary>
+        /// 压缩机铭板号
+        /// </summary>
+        [Column(DbType = "nvarchar(16)")]
+        public string PlaqueNo { get; set; }
+        /// <summary>
+        /// 生产线号
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string ProLineNo { get; set; }
+        /// <summary>
+        /// 机种确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string MachineTypeCheck { get; set; }
+        /// <summary>
+        /// 铭板确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string PlaqueCheck { get; set; }
+        /// <summary>
+        /// 端子确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string TerminalCheck { get; set; }
+        /// <summary>
+        /// 电器盒确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string ElectricalBoxCheck { get; set; }
+        /// <summary>
+        /// 密封塞确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string SealingPlugCheck { get; set; }
+        /// <summary>
+        /// 吸入管吐出管确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string InOutTubeCheck { get; set; }
+        /// <summary>
+        /// 上外罩确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string UpperCoverCheck { get; set; }
+        /// <summary>
+        /// 储液器确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string ReservoirCheck { get; set; }
+        /// <summary>
+        /// 继手管确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string HandTubeCheck { get; set; }
+        /// <summary>
+        /// 点焊确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string WeldCheck { get; set; }
+        /// <summary>
+        /// 涂装确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string PaintCheck { get; set; }
+        /// <summary>
+        /// 吊耳确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string LiftLugCheck { get; set; }
+        /// <summary>
+        /// 环焊确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string GirthWeldCheck { get; set; }
+        /// <summary>
+        /// 焊渣确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string WeldSlagCheck { get; set; }
+        /// <summary>
+        /// 紧固环皮垫确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string FastenLeatherPadCheck { get; set; }
+        /// <summary>
+        /// 筒体确认
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string CylinderCheck { get; set; }
+        /// <summary>
+        /// 外观检查结果
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 测试人员工号
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string OperationNo { get; set; }
+
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+    }
+}
diff --git a/GroupLine.Model/BurPlugInstall.cs b/GroupLine.Model/BurPlugInstall.cs
new file mode 100644
index 0000000..6899853
--- /dev/null
+++ b/GroupLine.Model/BurPlugInstall.cs
@@ -0,0 +1,57 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 埋塞敲入螺旋钉安装
+    /// </summary>
+    [Table(Name = "dbo.BurPlugInstall")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_StaticDiskNo", "StaticDiskNo", false)]
+    public class BurPlugInstall
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string StaticDiskNo { get; set; }
+
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+
+        /// <summary>
+        /// 螺旋螺钉判定
+        /// </summary>
+        [Column(DbType = "int")]
+        public int SpiralScrewCheck { get; set; }
+
+        /// <summary>
+        /// 动静盘埋塞判定
+        /// </summary>
+        [Column(DbType = "int")]
+        public int StaDycDiskCheck { get; set; }
+
+        /// <summary>
+        /// 盖板埋塞判定
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CoverPlugCheck { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/CylinderEngrav.cs b/GroupLine.Model/CylinderEngrav.cs
new file mode 100644
index 0000000..2b0f925
--- /dev/null
+++ b/GroupLine.Model/CylinderEngrav.cs
@@ -0,0 +1,37 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 筒体刻印机
+    /// </summary>
+    [Table(Name = "dbo.CylinderEngrav")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class CylinderEngrav
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/ExhInstallMes.cs b/GroupLine.Model/ExhInstallMes.cs
new file mode 100644
index 0000000..fe7ba7d
--- /dev/null
+++ b/GroupLine.Model/ExhInstallMes.cs
@@ -0,0 +1,213 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 排气盖板安装气密检测
+    /// </summary>
+    [Table(Name = "dbo.ExhInstallMes")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class ExhInstallMes
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 机型
+        /// </summary>
+        [Column(DbType = "nvarchar(15)")]
+        public string MachineCode { get; set; }
+
+        /// <summary>
+        /// 动盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string DynaDiskNo { get; set; }
+
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string StaticDiskNo { get; set; }
+
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Cycle { get; set; }
+
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        [Column(DbType = "int")]
+        public int ScrewCount { get; set; }
+
+        /// <summary>
+        /// 员工编号/CylinderNo 更改错了
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+
+        /// <summary>
+        /// 排气盖板扭矩
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque { get; set; }
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque2 { get; set; }
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle2 { get; set; }
+
+
+
+        /// <summary>
+        /// 排气盖板扭矩3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque3 { get; set; }
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle3 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque4 { get; set; }
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle4 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩5
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque5 { get; set; }
+        /// <summary>
+        /// 最终角度5
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle5 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩6
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque6 { get; set; }
+        /// <summary>
+        /// 最终角度6
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle6 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩7
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque7 { get; set; }
+        /// <summary>
+        /// 最终角度7
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle7 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩8
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque8 { get; set; }
+        /// <summary>
+        /// 最终角度8
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle8 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩9
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque9 { get; set; }
+        /// <summary>
+        /// 最终角度9
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle9 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩10
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque10 { get; set; }
+        /// <summary>
+        /// 最终角度10
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle10 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩11
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque11 { get; set; }
+        /// <summary>
+        /// 最终角度11
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle11 { get; set; }
+
+
+        /// <summary>
+        /// 排气盖板扭矩12
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ExhausTorque12 { get; set; }
+        /// <summary>
+        /// 最终角度12
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle12 { get; set; }
+
+
+        /// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GCDTransplant.cs b/GroupLine.Model/GCDTransplant.cs
new file mode 100644
index 0000000..090b6c7
--- /dev/null
+++ b/GroupLine.Model/GCDTransplant.cs
@@ -0,0 +1,32 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型C-D移栽
+    /// </summary>
+    [Table(Name = "dbo.GCDTransplant")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GCDTransplant
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GCylinderBurnEb.cs b/GroupLine.Model/GCylinderBurnEb.cs
new file mode 100644
index 0000000..fb8e098
--- /dev/null
+++ b/GroupLine.Model/GCylinderBurnEb.cs
@@ -0,0 +1,53 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型筒体烧嵌
+    /// </summary>
+    [Table(Name = "dbo.GCylinderBurnEb")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_StatoNo", "StatoNo", false)]
+    public class GCylinderBurnEb
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 定子编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string StatoNo { get; set; }
+/// <summary>
+        /// A托盘号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string ATrayNo { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 筒体温度
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal CylinderTemp { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GDynStaticMach.cs b/GroupLine.Model/GDynStaticMach.cs
new file mode 100644
index 0000000..31ec935
--- /dev/null
+++ b/GroupLine.Model/GDynStaticMach.cs
@@ -0,0 +1,64 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型动静盘组装机
+    /// </summary>
+    [Table(Name = "dbo.GDynStaticMach")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_DynaDiskNo", "DynaDiskNo", false)]
+    [Index("IX_StaticDiskNo", "StaticDiskNo", false)]
+    public class GDynStaticMach
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 动盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string DynaDiskNo { get; set; }
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string StaticDiskNo { get; set; }
+        /// <summary>
+        /// 欧式机构
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string EuropMacine { get; set; }
+        /// <summary>
+        /// 静盘铸件号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string StaDskCastNo { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        ///// <summary>
+        ///// 扭矩值
+        ///// </summary>
+        //[Column(DbType = "decimal(8, 2)")]
+        public decimal Torque { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GInsRotaRes.cs b/GroupLine.Model/GInsRotaRes.cs
new file mode 100644
index 0000000..a0d0b58
--- /dev/null
+++ b/GroupLine.Model/GInsRotaRes.cs
@@ -0,0 +1,70 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型绝缘、回转方向、电阻测量
+    /// </summary>
+    [Table(Name = "dbo.GInsRotaRes")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GInsRotaRes
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 绝缘结果
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string IsolateResults { get; set; }
+        /// <summary>
+        /// 电阻值1
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal ResValue1 { get; set; }
+        /// <summary>
+        /// 电阻值2
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal ResValue2 { get; set; }
+        /// <summary>
+        /// 电阻值3
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal ResValue3 { get; set; }
+
+        /// <summary>
+        /// 回转放行结果
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string RotaResult { get; set; }
+
+        /// <summary>
+        /// 阻值结果
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string ResResult { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GLeakCheck.cs b/GroupLine.Model/GLeakCheck.cs
new file mode 100644
index 0000000..b506202
--- /dev/null
+++ b/GroupLine.Model/GLeakCheck.cs
@@ -0,0 +1,52 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型高低压泄露检查
+    /// </summary>
+    [Table(Name = "dbo.GLeakCheck")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GLeakCheck
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 抽真空值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal PumpVacuum { get; set; }
+        /// <summary>
+        /// 保持真空值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal KeepVacuum { get; set; }
+        /// <summary>
+        /// 抽真空值判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string PumpVamResult { get; set; }
+        /// <summary>
+        /// 保持真空值判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string KeepVamResult { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GLowVolStart.cs b/GroupLine.Model/GLowVolStart.cs
new file mode 100644
index 0000000..5717109
--- /dev/null
+++ b/GroupLine.Model/GLowVolStart.cs
@@ -0,0 +1,57 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型低电压启动
+    /// </summary>
+    [Table(Name = "dbo.GLowVolStart")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GLowVolStart
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// A相电流值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ACur { get; set; }
+/// <summary>
+        /// B相电流值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal BCur { get; set; }
+/// <summary>
+        /// C相电流值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal CCur { get; set; }
+/// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GMagTorque.cs b/GroupLine.Model/GMagTorque.cs
new file mode 100644
index 0000000..7d58630
--- /dev/null
+++ b/GroupLine.Model/GMagTorque.cs
@@ -0,0 +1,47 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型磁束扭矩检测工位
+    /// </summary>
+    [Table(Name = "dbo.GMagTorque")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GMagTorque
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 磁束值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal MagBeamCount { get; set; }
+/// <summary>
+        /// 扭矩值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal TorqueValue { get; set; }
+/// <summary>
+        /// 结果
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GOilPumpInstall.cs b/GroupLine.Model/GOilPumpInstall.cs
new file mode 100644
index 0000000..4052bfa
--- /dev/null
+++ b/GroupLine.Model/GOilPumpInstall.cs
@@ -0,0 +1,63 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型油泵安装工位
+    /// </summary>
+    [Table(Name = "dbo.GOilPumpInstall")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_OilPumpNo", "OilPumpNo", false)]
+    public class GOilPumpInstall
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 油泵编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string OilPumpNo { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 油泵磕伤确认
+        /// </summary>
+        [Column(DbType = "int")]
+        public int OilPmpBruRsult { get; set; }
+/// <summary>
+        /// 是否是返修品
+        /// </summary>
+        [Column(DbType = "int")]
+        public int IsReturn { get; set; }
+/// <summary>
+        /// 焊点外观
+        /// </summary>
+        [Column(DbType = "int")]
+        public int WeldSpotUI { get; set; }
+/// <summary>
+        /// 结果
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GRingWeldMach.cs b/GroupLine.Model/GRingWeldMach.cs
new file mode 100644
index 0000000..dec41de
--- /dev/null
+++ b/GroupLine.Model/GRingWeldMach.cs
@@ -0,0 +1,82 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型环焊机
+    /// </summary>
+    [Table(Name = "dbo.GRingWeldMach")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GRingWeldMach
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 电压值1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol1 { get; set; }
+        /// <summary>
+        /// 电流值1
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur1 { get; set; }
+        /// <summary>
+        /// 焊接时间1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime1 { get; set; }
+        /// <summary>
+        /// 电压值2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol2 { get; set; }
+        /// <summary>
+        /// 电流值2
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur2 { get; set; }
+        /// <summary>
+        /// 焊接时间2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime2 { get; set; }
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleClean { get; set; }
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleReplace { get; set; }
+        /// <summary>
+        /// 夹具
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Fixture { get; set; }
+        /// <summary>
+        /// 判定OK/NG
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GRotorBurnEb.cs b/GroupLine.Model/GRotorBurnEb.cs
new file mode 100644
index 0000000..b8b2f97
--- /dev/null
+++ b/GroupLine.Model/GRotorBurnEb.cs
@@ -0,0 +1,43 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型转子烧嵌
+    /// </summary>
+    [Table(Name = "dbo.GRotorBurnEb")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_RotorNo", "RotorNo", false)]
+    [Index("IX_CrankshaftNo", "CrankshaftNo", false)]
+    public class GRotorBurnEb
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 转子编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string RotorNo { get; set; }
+/// <summary>
+        /// 曲轴编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CrankshaftNo { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GRotorMag.cs b/GroupLine.Model/GRotorMag.cs
new file mode 100644
index 0000000..459a2e3
--- /dev/null
+++ b/GroupLine.Model/GRotorMag.cs
@@ -0,0 +1,57 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型转子着磁
+    /// </summary>
+    [Table(Name = "dbo.GRotorMag")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_RotorNo", "RotorNo", false)]
+    public class GRotorMag
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 转子编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string RotorNo { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 磁束量
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal MagBeamCount { get; set; }
+        /// <summary>
+        /// 电流值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)",Name = "CurrentValue")]
+        public decimal Current { get; set; }
+        /// <summary>
+        /// 转子角度
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal RotorAngle { get; set; }
+        /// <summary>
+        /// 转子角度判定
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string RotorAgleRsult { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GShrinkTub.cs b/GroupLine.Model/GShrinkTub.cs
new file mode 100644
index 0000000..23989a4
--- /dev/null
+++ b/GroupLine.Model/GShrinkTub.cs
@@ -0,0 +1,52 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型缩管
+    /// </summary>
+    [Table(Name = "dbo.GShrinkTub")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GShrinkTub
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 终负荷
+        /// </summary>
+        [Column(DbType = "decimal")]
+        public decimal FinalLoad { get; set; }
+        /// <summary>
+        /// 终位置
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalLocation { get; set; }
+        /// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GSpotWeldMach.cs b/GroupLine.Model/GSpotWeldMach.cs
new file mode 100644
index 0000000..880ff6c
--- /dev/null
+++ b/GroupLine.Model/GSpotWeldMach.cs
@@ -0,0 +1,162 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型点焊机
+    /// </summary>
+    [Table(Name = "dbo.GSpotWeldMach")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GSpotWeldMach
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 电压R1-1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal VolR1_1 { get; set; }
+/// <summary>
+        /// 电流R1-1
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CurR1_1 { get; set; }
+/// <summary>
+        /// 焊接时间R1-1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTimeR1_1 { get; set; }
+/// <summary>
+        /// 电压R1-2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal VolR1_2 { get; set; }
+/// <summary>
+        /// 电流R1-2
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CurR1_2 { get; set; }
+/// <summary>
+        /// 焊接时间R1-2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTimeR1_2 { get; set; }
+/// <summary>
+        /// 电压R1-3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal VolR1_3 { get; set; }
+/// <summary>
+        /// 电流R1-3
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CurR1_3 { get; set; }
+/// <summary>
+        /// 焊接时间R1-3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTimeR1_3 { get; set; }
+/// <summary>
+        /// 电压R1-4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal VolR1_4 { get; set; }
+/// <summary>
+        /// 电流R1-4
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CurR1_4 { get; set; }
+/// <summary>
+        /// 焊接时间R1-4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTimeR1_4 { get; set; }
+/// <summary>
+        /// 电压R2-1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal VolR2_1 { get; set; }
+/// <summary>
+        /// 电流R2-1
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CurR2_1 { get; set; }
+/// <summary>
+        /// 焊接时间R2-1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTimeR2_1 { get; set; }
+/// <summary>
+        /// 电压R2-2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal VolR2_2 { get; set; }
+/// <summary>
+        /// 电流R2-2
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CurR2_2 { get; set; }
+/// <summary>
+        /// 焊接时间R2-2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTimeR2_2 { get; set; }
+/// <summary>
+        /// 电压R2-3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal VolR2_3 { get; set; }
+/// <summary>
+        /// 电流R2-3
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CurR2_3 { get; set; }
+/// <summary>
+        /// 焊接时间R2-3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTimeR2_3 { get; set; }
+/// <summary>
+        /// 电压R2-4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal VolR2_4 { get; set; }
+/// <summary>
+        /// 电流R2-4
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CurR2_4 { get; set; }
+/// <summary>
+        /// 焊接时间R2-4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTimeR2_4 { get; set; }
+/// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleClean { get; set; }
+/// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleReplace { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GStaticDiskMach.cs b/GroupLine.Model/GStaticDiskMach.cs
new file mode 100644
index 0000000..d4c6762
--- /dev/null
+++ b/GroupLine.Model/GStaticDiskMach.cs
@@ -0,0 +1,206 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// G型静盘组装机
+    /// </summary>
+    [Table(Name = "dbo.GStaticDiskMach")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class GStaticDiskMach
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+
+        /// <summary>
+        /// 机型
+        /// </summary>
+        [Column(DbType = "nvarchar(15)")]
+        public string MachineCode { get; set; }
+
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Cycle { get; set; }
+
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        [Column(DbType = "int")]
+        public int ScrewCount { get; set; }
+
+        /// <summary>
+        /// 最终扭矩
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque { get; set; }
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩2
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque2 { get; set; }
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle2 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩3
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque3 { get; set; }
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle3 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩4
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque4 { get; set; }
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle4 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩5
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque5 { get; set; }
+        /// <summary>
+        /// 最终角度5
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle5 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩6
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque6 { get; set; }
+        /// <summary>
+        /// 最终角度6
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle6 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩7
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque7 { get; set; }
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle7 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩8
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque8 { get; set; }
+        /// <summary>
+        /// 最终角度8
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle8 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩9
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque9 { get; set; }
+        /// <summary>
+        /// 最终角度9
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle9 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩10
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque10 { get; set; }
+        /// <summary>
+        /// 最终角度10
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle10 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩11
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque11 { get; set; }
+        /// <summary>
+        /// 最终角度11
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle11 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩12
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque12 { get; set; }
+        /// <summary>
+        /// 最终角度12
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle12 { get; set; }
+
+
+        /// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/GroupLine.Model.csproj b/GroupLine.Model/GroupLine.Model.csproj
new file mode 100644
index 0000000..04a9bc2
--- /dev/null
+++ b/GroupLine.Model/GroupLine.Model.csproj
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{7B3AC8E7-3CDA-4D30-8D65-42092AA62BB9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>GroupLine.Model</RootNamespace>
+    <AssemblyName>GroupLine.Model</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FreeSql, Version=3.2.692.0, Culture=neutral, PublicKeyToken=a33928e5d4a4b39c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FreeSql.3.2.692\lib\net451\FreeSql.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="KPRingWeldMachDw.cs" />
+    <Compile Include="KPRingWeldMachUp.cs" />
+    <Compile Include="KPShrinkTub.cs" />
+    <Compile Include="KPUpBurnEb.cs" />
+    <Compile Include="OilPumpInstall.cs" />
+    <Compile Include="MagTorque.cs" />
+    <Compile Include="KanBan\PlanCount.cs" />
+    <Compile Include="KanBan\WorkTime.cs" />
+    <Compile Include="OffsetConfig.cs" />
+    <Compile Include="AppearanceTest.cs" />
+    <Compile Include="CylinderEngrav.cs" />
+    <Compile Include="TermWeld.cs" />
+    <Compile Include="GCylinderBurnEb.cs" />
+    <Compile Include="GRotorBurnEb.cs" />
+    <Compile Include="GRotorMag.cs" />
+    <Compile Include="GInsRotaRes.cs" />
+    <Compile Include="PRacktPress.cs" />
+    <Compile Include="PRacktWeld.cs" />
+    <Compile Include="PLowWeld.cs" />
+    <Compile Include="PCoreMes.cs" />
+    <Compile Include="GMagTorque.cs" />
+    <Compile Include="KPMagTorque.cs" />
+    <Compile Include="GOilPumpInstall.cs" />
+    <Compile Include="KPOilPumpInstall.cs" />
+    <Compile Include="GCDTransplant.cs" />
+    <Compile Include="KPCDTransplant.cs" />
+    <Compile Include="GLeakCheck.cs" />
+    <Compile Include="KPLeakCheck.cs" />
+    <Compile Include="KPSealInstall.cs" />
+    <Compile Include="ExhInstallMes.cs" />
+    <Compile Include="BurPlugInstall.cs" />
+    <Compile Include="OverflowLeakMes.cs" />
+    <Compile Include="StaticDiscPress.cs" />
+    <Compile Include="GDynStaticMach.cs" />
+    <Compile Include="KPDynStaticMach.cs" />
+    <Compile Include="GLowVolStart.cs" />
+    <Compile Include="KPLowVolStart.cs" />
+    <Compile Include="GSpotWeldMach.cs" />
+    <Compile Include="KPSpotWeldMach.cs" />
+    <Compile Include="GRingWeldMach.cs" />
+    <Compile Include="KPRingWeldMach.cs" />
+    <Compile Include="GShrinkTub.cs" />
+    <Compile Include="GStaticDiskMach.cs" />
+    <Compile Include="KPStaticDiskMach.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SystemConfig.cs" />
+    <Compile Include="PlaquePrint.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/GroupLine.Model/KPCDTransplant.cs b/GroupLine.Model/KPCDTransplant.cs
new file mode 100644
index 0000000..9ff13ac
--- /dev/null
+++ b/GroupLine.Model/KPCDTransplant.cs
@@ -0,0 +1,32 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型C-D移栽
+    /// </summary>
+    [Table(Name = "dbo.KPCDTransplant")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPCDTransplant
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPDynStaticMach.cs b/GroupLine.Model/KPDynStaticMach.cs
new file mode 100644
index 0000000..22eb2e6
--- /dev/null
+++ b/GroupLine.Model/KPDynStaticMach.cs
@@ -0,0 +1,96 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型动静盘组装机
+    /// </summary>
+    [Table(Name = "dbo.KPDynStaticMach")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_DynaDiskNo", "DynaDiskNo", false)]
+    [Index("IX_StaticDiskNo", "StaticDiskNo", false)]
+    public class KPDynStaticMach
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+
+        /// <summary>
+        /// 动盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string DynaDiskNo { get; set; }
+
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string StaticDiskNo { get; set; }
+
+        /// <summary>
+        /// 欧式机构
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string EuropMacine { get; set; }
+
+        /// <summary>
+        /// 静盘铸件号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string StaDskCastNo { get; set; }
+
+
+        /// <summary>
+        /// 间隙值 玛仪器测量
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string MeterGap { get; set; }
+
+        /// <summary>
+        /// 分组 玛仪器测量
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string MeterGroup { get; set; }
+
+        /// <summary>
+        /// 结论 玛仪器测量
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string MeterResult { get; set; }
+
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+
+        ///// <summary>
+        ///// 扭矩值
+        ///// </summary>
+        //[Column(DbType = "decimal(8, 2)")]
+        //public decimal Torque { get; set; }
+
+        /// <summary>
+        /// 欧式机构段差值
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string EuopMaDifValue { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPLeakCheck.cs b/GroupLine.Model/KPLeakCheck.cs
new file mode 100644
index 0000000..76b56f3
--- /dev/null
+++ b/GroupLine.Model/KPLeakCheck.cs
@@ -0,0 +1,52 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型高低压泄露检查
+    /// </summary>
+    [Table(Name = "dbo.KPLeakCheck")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPLeakCheck
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 抽真空值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal PumpVacuum { get; set; }
+/// <summary>
+        /// 保持真空值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal KeepVacuum { get; set; }
+/// <summary>
+        /// 抽真空值判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string PumpVamResult { get; set; }
+/// <summary>
+        /// 保持真空值判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string KeepVamResult { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPLowVolStart.cs b/GroupLine.Model/KPLowVolStart.cs
new file mode 100644
index 0000000..2989cc7
--- /dev/null
+++ b/GroupLine.Model/KPLowVolStart.cs
@@ -0,0 +1,57 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型低电压启动
+    /// </summary>
+    [Table(Name = "dbo.KPLowVolStart")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPLowVolStart
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// A相电流值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ACur { get; set; }
+/// <summary>
+        /// B相电流值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal BCur { get; set; }
+/// <summary>
+        /// C相电流值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal CCur { get; set; }
+/// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPMagTorque.cs b/GroupLine.Model/KPMagTorque.cs
new file mode 100644
index 0000000..b38fecb
--- /dev/null
+++ b/GroupLine.Model/KPMagTorque.cs
@@ -0,0 +1,47 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型磁束扭矩检测工位
+    /// </summary>
+    [Table(Name = "dbo.KPMagTorque")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPMagTorque
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 磁束值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal MagBeamCount { get; set; }
+/// <summary>
+        /// 扭矩值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal TorqueValue { get; set; }
+/// <summary>
+        /// 结果
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPOilPumpInstall.cs b/GroupLine.Model/KPOilPumpInstall.cs
new file mode 100644
index 0000000..16dc367
--- /dev/null
+++ b/GroupLine.Model/KPOilPumpInstall.cs
@@ -0,0 +1,63 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型油泵安装工位
+    /// </summary>
+    [Table(Name = "dbo.KPOilPumpInstall")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_OilPumpNo", "OilPumpNo", false)]
+    public class KPOilPumpInstall
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 油泵编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string OilPumpNo { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 油泵磕伤确认
+        /// </summary>
+        [Column(DbType = "int")]
+        public int OilPmpBruRsult { get; set; }
+/// <summary>
+        /// 是否是返修品
+        /// </summary>
+        [Column(DbType = "int")]
+        public int IsReturn { get; set; }
+/// <summary>
+        /// 焊点外观
+        /// </summary>
+        [Column(DbType = "int")]
+        public int WeldSpotUI { get; set; }
+/// <summary>
+        /// 结果
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPRingWeldMach.cs b/GroupLine.Model/KPRingWeldMach.cs
new file mode 100644
index 0000000..656ac1b
--- /dev/null
+++ b/GroupLine.Model/KPRingWeldMach.cs
@@ -0,0 +1,82 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型环焊机
+    /// </summary>
+    [Table(Name = "dbo.KPRingWeldMach")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPRingWeldMach
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 电压值1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol1 { get; set; }
+/// <summary>
+        /// 电流值1
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur1 { get; set; }
+/// <summary>
+        /// 焊接时间1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime1 { get; set; }
+/// <summary>
+        /// 电压值2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol2 { get; set; }
+/// <summary>
+        /// 电流值2
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur2 { get; set; }
+/// <summary>
+        /// 焊接时间2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime2 { get; set; }
+/// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleClean { get; set; }
+/// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleReplace { get; set; }
+/// <summary>
+        /// 夹具
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Fixture { get; set; }
+/// <summary>
+        /// 判定OK/NG
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPRingWeldMachDw.cs b/GroupLine.Model/KPRingWeldMachDw.cs
new file mode 100644
index 0000000..256f0b3
--- /dev/null
+++ b/GroupLine.Model/KPRingWeldMachDw.cs
@@ -0,0 +1,86 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// KP型环焊机底部焊接
+    /// </summary>
+    [Table(Name = "dbo.KPRingWeldMachDw")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPRingWeldMachDw
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 电压值1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol1 { get; set; }
+        /// <summary>
+        /// 电流值1
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur1 { get; set; }
+        /// <summary>
+        /// 焊接时间1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime1 { get; set; }
+        /// <summary>
+        /// 电压值2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol2 { get; set; }
+        /// <summary>
+        /// 电流值2
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur2 { get; set; }
+        /// <summary>
+        /// 焊接时间2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime2 { get; set; }
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleClean { get; set; }
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleReplace { get; set; }
+        /// <summary>
+        /// 夹具
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Fixture { get; set; }
+        /// <summary>
+        /// 判定OK/NG
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPRingWeldMachUp.cs b/GroupLine.Model/KPRingWeldMachUp.cs
new file mode 100644
index 0000000..d0ccc24
--- /dev/null
+++ b/GroupLine.Model/KPRingWeldMachUp.cs
@@ -0,0 +1,86 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// KP型环焊机顶部焊接
+    /// </summary>
+    [Table(Name = "dbo.KPRingWeldMachUp")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPRingWeldMachUp
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 电压值1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol1 { get; set; }
+        /// <summary>
+        /// 电流值1
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur1 { get; set; }
+        /// <summary>
+        /// 焊接时间1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime1 { get; set; }
+        /// <summary>
+        /// 电压值2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol2 { get; set; }
+        /// <summary>
+        /// 电流值2
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur2 { get; set; }
+        /// <summary>
+        /// 焊接时间2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime2 { get; set; }
+        /// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleClean { get; set; }
+        /// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleReplace { get; set; }
+        /// <summary>
+        /// 夹具
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Fixture { get; set; }
+        /// <summary>
+        /// 判定OK/NG
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPSealInstall.cs b/GroupLine.Model/KPSealInstall.cs
new file mode 100644
index 0000000..09d3f72
--- /dev/null
+++ b/GroupLine.Model/KPSealInstall.cs
@@ -0,0 +1,187 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型密封盖板安装
+    /// </summary>
+    [Table(Name = "dbo.KPSealInstall")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPSealInstall
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 密封盖板
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string SealCover { get; set; }
+
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Cycle { get; set; }
+
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        [Column(DbType = "int")]
+        public int ScrewCount { get; set; }
+
+        /// <summary>
+        /// 最终扭矩
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque { get; set; }
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle { get; set; }
+              
+        /// <summary>
+        /// 最终扭矩2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque2 { get; set; }
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle2 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque3 { get; set; }
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle3 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque4 { get; set; }
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle4 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩5
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque5 { get; set; }
+        /// <summary>
+        /// 最终角度5
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle5 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩6
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque6 { get; set; }
+        /// <summary>
+        /// 最终角度6
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle6 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩7
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque7 { get; set; }
+        /// <summary>
+        /// 最终角度7
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle7 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩8
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque8 { get; set; }
+        /// <summary>
+        /// 最终角度8
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle8 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩9
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque9 { get; set; }
+        /// <summary>
+        /// 最终角度9
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle9 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩10
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque10 { get; set; }
+        /// <summary>
+        /// 最终角度10
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle10 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩11
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque11 { get; set; }
+        /// <summary>
+        /// 最终角度11
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle11 { get; set; }
+
+        /// <summary>
+        /// 最终扭矩12
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalTorque12 { get; set; }
+        /// <summary>
+        /// 最终角度12
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle12 { get; set; }
+
+        /// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPShrinkTub.cs b/GroupLine.Model/KPShrinkTub.cs
new file mode 100644
index 0000000..009858c
--- /dev/null
+++ b/GroupLine.Model/KPShrinkTub.cs
@@ -0,0 +1,58 @@
+using FreeSql.DataAnnotations;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P型缩管
+    /// </summary>
+    [Table(Name = "dbo.KPShrinkTub")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPShrinkTub
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+
+        /// <summary>
+        /// 终负荷
+        /// </summary>
+        [Column(DbType = "decimal(8, 1)")]
+        public decimal FinalLoad { get; set; }
+
+        /// <summary>
+        /// 终位置
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalLocation { get; set; }
+        /// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPSpotWeldMach.cs b/GroupLine.Model/KPSpotWeldMach.cs
new file mode 100644
index 0000000..f39bd15
--- /dev/null
+++ b/GroupLine.Model/KPSpotWeldMach.cs
@@ -0,0 +1,132 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P点焊机
+    /// </summary>
+    [Table(Name = "dbo.KPSpotWeldMach")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPSpotWeldMach
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 电压1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol1 { get; set; }
+/// <summary>
+        /// 电流1
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur1 { get; set; }
+/// <summary>
+        /// 焊接时间1
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime1 { get; set; }
+/// <summary>
+        /// 电压2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol2 { get; set; }
+/// <summary>
+        /// 电流2
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur2 { get; set; }
+/// <summary>
+        /// 焊接时间2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime2 { get; set; }
+/// <summary>
+        /// 电压3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol3 { get; set; }
+/// <summary>
+        /// 电流3
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur3 { get; set; }
+/// <summary>
+        /// 焊接时间3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime3 { get; set; }
+/// <summary>
+        /// 电压4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol4 { get; set; }
+/// <summary>
+        /// 电流4
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur4 { get; set; }
+/// <summary>
+        /// 焊接时间4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime4 { get; set; }
+/// <summary>
+        /// 电压5
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol5 { get; set; }
+/// <summary>
+        /// 电流5
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur5 { get; set; }
+/// <summary>
+        /// 焊接时间5
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime5 { get; set; }
+/// <summary>
+        /// 电压6
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Vol6 { get; set; }
+/// <summary>
+        /// 电流6
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Cur6 { get; set; }
+/// <summary>
+        /// 焊接时间6
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal WeldTime6 { get; set; }
+/// <summary>
+        /// 喷嘴清洁
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleClean { get; set; }
+/// <summary>
+        /// 喷嘴更换
+        /// </summary>
+        [Column(DbType = "int")]
+        public int NozzleReplace { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPStaticDiskMach.cs b/GroupLine.Model/KPStaticDiskMach.cs
new file mode 100644
index 0000000..c653326
--- /dev/null
+++ b/GroupLine.Model/KPStaticDiskMach.cs
@@ -0,0 +1,205 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// K/P静盘组装机
+    /// </summary>
+    [Table(Name = "dbo.KPStaticDiskMach")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class KPStaticDiskMach
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+
+
+        /// <summary>
+        /// 机型
+        /// </summary>
+        [Column(DbType = "nvarchar(15)")]
+        public string MachineCode { get; set; }
+
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Cycle { get; set; }
+
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        [Column(DbType = "int")]
+        public int ScrewCount { get; set; }
+
+        /// <summary>
+        /// 最终扭矩
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque { get; set; }
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩2
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque2 { get; set; }
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle2 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩3
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque3 { get; set; }
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle3 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩4
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque4 { get; set; }
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle4 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩5
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque5 { get; set; }
+        /// <summary>
+        /// 最终角度5
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle5 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩6
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque6 { get; set; }
+        /// <summary>
+        /// 最终角度6
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle6 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩7
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque7 { get; set; }
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle7 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩8
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque8 { get; set; }
+        /// <summary>
+        /// 最终角度8
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle8 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩9
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque9 { get; set; }
+        /// <summary>
+        /// 最终角度9
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle9 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩10
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque10 { get; set; }
+        /// <summary>
+        /// 最终角度10
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle10 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩11
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque11 { get; set; }
+        /// <summary>
+        /// 最终角度11
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle11 { get; set; }
+
+
+        /// <summary>
+        /// 最终扭矩12
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalTorque12 { get; set; }
+        /// <summary>
+        /// 最终角度12
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal FinalAngle12 { get; set; }
+
+        /// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KPUpBurnEb.cs b/GroupLine.Model/KPUpBurnEb.cs
new file mode 100644
index 0000000..0e40a03
--- /dev/null
+++ b/GroupLine.Model/KPUpBurnEb.cs
@@ -0,0 +1,58 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// KP上配重烧嵌
+    /// </summary>
+    [Table(Name = "dbo.KPUpBurnEb")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CrankshaftNo", "CrankshaftNo", false)]
+    public class KPUpBurnEb
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 曲轴编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CrankshaftNo { get; set; }
+
+        /// <summary>
+        /// 测头A
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ProbeA { get; set; }
+
+        /// <summary>
+        /// 测头B
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal ProbeB { get; set; }
+
+        /// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/KanBan/PlanCount.cs b/GroupLine.Model/KanBan/PlanCount.cs
new file mode 100644
index 0000000..c8183b9
--- /dev/null
+++ b/GroupLine.Model/KanBan/PlanCount.cs
@@ -0,0 +1,53 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model.KanBan
+{
+    [Table(Name = "dbo.PlanCount")]
+    public class PlanCount
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column(IsPrimary = true)]
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 计划日期
+        /// </summary>
+        [Column(Name = "PlanDate", IsNullable = true)]
+        public DateTime PlanDate { get; set; }
+
+        /// <summary>
+        /// 班次
+        /// </summary>
+        [Column(Name = "ClassNum", IsNullable = false, StringLength = 20)]
+        public string ClassNum { get; set; }
+
+        /// <summary>
+        /// 前组
+        /// </summary>
+        [Column(Name = "AGroup", IsNullable = false)]
+        public int AGroup { get; set; }
+
+        /// <summary>
+        /// 后组
+        /// </summary>
+        [Column(Name = "BGroup", IsNullable = false)]
+        public int BGroup { get; set; }
+
+        /// <summary>
+        /// 装配-完成
+        /// </summary>
+        [Column(Name = "CGroup", IsNullable = false)]
+        public int CGroup { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
+        public DateTime CreateTime { get; set; }
+
+    }
+
+}
diff --git a/GroupLine.Model/KanBan/WorkTime.cs b/GroupLine.Model/KanBan/WorkTime.cs
new file mode 100644
index 0000000..7777aea
--- /dev/null
+++ b/GroupLine.Model/KanBan/WorkTime.cs
@@ -0,0 +1,46 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model.KanBan
+{
+    [Table(Name = "dbo.WorkTime")]
+    public class WorkTime
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column(IsPrimary = true)]
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        [Column(Name = "IndexNum", IsNullable = false, StringLength = 20)]
+        public string IndexNum { get; set; }
+
+        /// <summary>
+        /// 班次
+        /// </summary>
+        [Column(Name = "ClassNum", IsNullable = false, StringLength = 20)]
+        public string ClassNum { get; set; }
+
+        /// <summary>
+        /// 开始时间
+        /// </summary>
+        [Column(Name = "StartTime", IsNullable = false, StringLength = 20)]
+        public string StartTime { get; set; }
+
+        /// <summary>
+        /// 结束时间
+        /// </summary>
+        [Column(Name = "EndTime", IsNullable = false, StringLength = 20)]
+        public string EndTime { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
+        public DateTime CreateTime { get; set; }
+    }
+
+}
diff --git a/GroupLine.Model/MagTorque.cs b/GroupLine.Model/MagTorque.cs
new file mode 100644
index 0000000..65b20ef
--- /dev/null
+++ b/GroupLine.Model/MagTorque.cs
@@ -0,0 +1,54 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 磁束扭矩检
+    /// </summary>
+    [Table(Name = "dbo.MagTorque")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class MagTorque
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true, IsPrimary = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(16)")]
+        public string CylinderNo { get; set; }
+
+        /// <summary>
+        /// 机种类型
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string ModelType { get; set; }
+
+        /// <summary>
+        /// 磁束值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal MagValue { get; set; }
+        /// <summary>
+        /// 扭矩值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal TorqueValue { get; set; }
+        /// <summary>
+        /// 结果
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/OffsetConfig.cs b/GroupLine.Model/OffsetConfig.cs
new file mode 100644
index 0000000..e27bf34
--- /dev/null
+++ b/GroupLine.Model/OffsetConfig.cs
@@ -0,0 +1,41 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    [Table(Name = "dbo.OffsetConfig")]
+    public class OffsetConfig
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column(IsPrimary = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 前组产量偏移
+        /// </summary>
+        [Column(DbType = "int")]
+        public int AGroupOffsetCount { get; set; }
+
+        /// <summary>
+        /// 后组产量偏移
+        /// </summary>
+        [Column(DbType = "int")]
+        public int BGroupOffsetCount { get; set; }
+
+        /// <summary>
+        /// 装配产量偏移-完成
+        /// </summary>
+        [Column(DbType = "int")]
+        public int CGroupOffsetCount { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(ServerTime = DateTimeKind.Local, CanUpdate = false)]
+        public DateTime CreateTime { get; set; }
+
+    }
+
+}
diff --git a/GroupLine.Model/OilPumpInstall.cs b/GroupLine.Model/OilPumpInstall.cs
new file mode 100644
index 0000000..f2b3eda
--- /dev/null
+++ b/GroupLine.Model/OilPumpInstall.cs
@@ -0,0 +1,65 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 油泵安装
+    /// </summary>
+    [Table(Name = "dbo.OilPumpInstall")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_OilPumpNo", "OilPumpNo", false)]
+    public class OilPumpInstall
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true, IsPrimary = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(16)")]
+        public string CylinderNo { get; set; }
+
+        /// <summary>
+        /// 机种类型
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string ModelType { get; set; }
+
+        /// <summary>
+        /// 油泵编号
+        /// </summary>
+        [Column(DbType = "nvarchar(16)")]
+        public string OilPumpNo { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 油泵磕伤确认
+        /// </summary>
+        [Column(DbType = "int")]
+        public int OilPumpDmge { get; set; }
+        /// <summary>
+        /// 是否是返修品
+        /// </summary>
+        [Column(DbType = "int")]
+        public int Repair { get; set; }
+        /// <summary>
+        /// 结果
+        /// </summary>
+        [Column(DbType = "nvarchar(2)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/OverflowLeakMes.cs b/GroupLine.Model/OverflowLeakMes.cs
new file mode 100644
index 0000000..1f6c93a
--- /dev/null
+++ b/GroupLine.Model/OverflowLeakMes.cs
@@ -0,0 +1,124 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 溢流阀安装泄露检查
+    /// </summary>
+    [Table(Name = "dbo.OverflowLeakMes")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_StaticDiskNo", "StaticDiskNo", false)]
+    public class OverflowLeakMes
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        ///// <summary>
+        ///// 静盘编号
+        ///// </summary>
+        //[Column(DbType = "nvarchar(10)")]
+        //public string StaticDiskNo { get; set; }
+
+
+        /// <summary>
+        /// 机型
+        /// </summary>
+        [Column(DbType = "nvarchar(15)")]
+        public string MachineCode { get; set; }
+
+        /// <summary>
+        /// 动盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string DynaDiskNo { get; set; }
+
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string StaticDiskNo { get; set; }
+
+        /// <summary>
+        /// 节拍
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal Cycle { get; set; }
+
+        /// <summary>
+        /// 螺丝数量
+        /// </summary>
+        [Column(DbType = "int")]
+        public int ScrewCount { get; set; }
+
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+
+
+        /// <summary>
+        /// 溢流阀扭矩
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal OverflowTorque { get; set; }
+        /// <summary>
+        /// 最终角度
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle { get; set; }
+
+
+        /// <summary>
+        /// 溢流阀扭矩2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal OverflowTorque2 { get; set; }
+        /// <summary>
+        /// 最终角度2
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle2 { get; set; }
+
+
+        /// <summary>
+        /// 溢流阀扭矩3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal OverflowTorque3 { get; set; }
+        /// <summary>
+        /// 最终角度3
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle3 { get; set; }
+
+
+        /// <summary>
+        /// 溢流阀扭矩4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal OverflowTorque4 { get; set; }
+        /// <summary>
+        /// 最终角度4
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal FinalAngle4 { get; set; }
+
+
+        /// <summary>
+        /// 判定
+        /// </summary>
+        [Column(DbType = "nvarchar(5)")]
+        public string Result { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/PCoreMes.cs b/GroupLine.Model/PCoreMes.cs
new file mode 100644
index 0000000..b93c668
--- /dev/null
+++ b/GroupLine.Model/PCoreMes.cs
@@ -0,0 +1,42 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 小P芯出测定
+    /// </summary>
+    [Table(Name = "dbo.PCoreMes")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    public class PCoreMes
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 芯出测量值
+        /// </summary>
+        [Column(DbType = "decimal(8, 3)")]
+        public decimal CoreOutput { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/PLowWeld.cs b/GroupLine.Model/PLowWeld.cs
new file mode 100644
index 0000000..325f04d
--- /dev/null
+++ b/GroupLine.Model/PLowWeld.cs
@@ -0,0 +1,73 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 小P下部焊接
+    /// </summary>
+    [Table(Name = "dbo.PLowWeld")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_CrankshaftNo", "CrankshaftNo", false)]
+    public class PLowWeld
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 曲轴编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string CrankshaftNo { get; set; }
+/// <summary>
+        /// 下部编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string DownNo { get; set; }
+/// <summary>
+        /// 下部铸件编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string DoCastNo { get; set; }
+/// <summary>
+        /// 定子压入深度
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal StatorPressDep { get; set; }
+/// <summary>
+        /// 转子压入深度
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal RotorPressDep { get; set; }
+/// <summary>
+        /// 塞尺检查（OK）
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string FelerGgeResult { get; set; }
+/// <summary>
+        /// 磁石检查（OK)
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string MagnetResult { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/PRacktPress.cs b/GroupLine.Model/PRacktPress.cs
new file mode 100644
index 0000000..8425cc6
--- /dev/null
+++ b/GroupLine.Model/PRacktPress.cs
@@ -0,0 +1,53 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 小P支架压入
+    /// </summary>
+    [Table(Name = "dbo.PRacktPress")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_RacktNo", "RacktNo", false)]
+    public class PRacktPress
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 支架编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string RacktNo { get; set; }
+/// <summary>
+        /// 压入压力
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal PressValue { get; set; }
+/// <summary>
+        /// 托盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string TrayNo { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/PRacktWeld.cs b/GroupLine.Model/PRacktWeld.cs
new file mode 100644
index 0000000..025a3a2
--- /dev/null
+++ b/GroupLine.Model/PRacktWeld.cs
@@ -0,0 +1,43 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 小P支架焊接
+    /// </summary>
+    [Table(Name = "dbo.PRacktWeld")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_CylinderNo", "CylinderNo", false)]
+    [Index("IX_TrayNo", "TrayNo", false)]
+    public class PRacktWeld
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 筒体编号
+        /// </summary>
+        [Column(DbType = "nvarchar(20)")]
+        public string CylinderNo { get; set; }
+/// <summary>
+        /// 托盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string TrayNo { get; set; }
+/// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+/// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/PlaquePrint.cs b/GroupLine.Model/PlaquePrint.cs
new file mode 100644
index 0000000..fec6a19
--- /dev/null
+++ b/GroupLine.Model/PlaquePrint.cs
@@ -0,0 +1,20 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 铭板打印
+    /// </summary>
+    [Table(Name = "dbo.PlaquePrint")]
+    public class PlaquePrint
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+
+    }
+}
diff --git a/GroupLine.Model/Properties/AssemblyInfo.cs b/GroupLine.Model/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..a10e94b
--- /dev/null
+++ b/GroupLine.Model/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// 有关程序集的一般信息由以下
+// 控制。更改这些特性值可修改
+// 与程序集关联的信息。
+[assembly: AssemblyTitle("GroupLine.Model")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("HP Inc.")]
+[assembly: AssemblyProduct("GroupLine.Model")]
+[assembly: AssemblyCopyright("Copyright © HP Inc. 2023")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// 将 ComVisible 设置为 false 会使此程序集中的类型
+//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
+//请将此类型的 ComVisible 特性设置为 true。
+[assembly: ComVisible(false)]
+
+// 如果此项目向 COM 公开，则下列 GUID 用于类型库的 ID
+[assembly: Guid("7b3ac8e7-3cda-4d30-8d65-42092aa62bb9")]
+
+// 程序集的版本信息由下列四个值组成: 
+//
+//      主版本
+//      次版本
+//      生成号
+//      修订号
+//
+//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
+//通过使用 "*"，如下所示:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/GroupLine.Model/StaticDiscPress.cs b/GroupLine.Model/StaticDiscPress.cs
new file mode 100644
index 0000000..e61615f
--- /dev/null
+++ b/GroupLine.Model/StaticDiscPress.cs
@@ -0,0 +1,53 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 静盘注液阀压入
+    /// </summary>
+    [Table(Name = "dbo.StaticDiscPress")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    [Index("IX_StaticDiskNo", "StaticDiskNo", false)]
+    public class StaticDiscPress
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 静盘编号
+        /// </summary>
+        [Column(DbType = "nvarchar(10)")]
+        public string StaticDiskNo { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 压力值
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal PressValue { get; set; }
+        /// <summary>
+        /// 压入深度
+        /// </summary>
+        [Column(DbType = "decimal(8, 2)")]
+        public decimal PressDepth { get; set; }
+        /// <summary>
+        /// 压入工位
+        /// </summary>
+        [Column(DbType = "int")]
+        public int PressStation { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+
+    }
+}
diff --git a/GroupLine.Model/SystemConfig.cs b/GroupLine.Model/SystemConfig.cs
new file mode 100644
index 0000000..7b17b6f
--- /dev/null
+++ b/GroupLine.Model/SystemConfig.cs
@@ -0,0 +1,48 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 系统配置信息
+    /// </summary>
+    [Table(Name = "dbo.SystemConfig")]
+    public class SystemConfig
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column(IsPrimary = true)]
+        public Guid Id { get; set; }
+
+        /// <summary>
+        /// 区域
+        /// </summary>
+        [Column(Name = "Region", IsNullable = false, StringLength = 20)]
+        public string Region { get; set; }
+
+        /// <summary>
+        /// 分类
+        /// </summary>
+        [Column(Name = "Category", IsNullable = false, StringLength = 20)]
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 属性名称
+        /// </summary>
+        [Column(Name = "Name", IsNullable = false, StringLength = 20)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 属性值
+        /// </summary>
+        [Column(Name = "Value", IsNullable = false, StringLength = 200)]
+        public string Value { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(ServerTime = DateTimeKind.Local, CanUpdate = true)]
+        public DateTime CreateTime { get; set; }
+    }
+}
diff --git a/GroupLine.Model/TermWeld.cs b/GroupLine.Model/TermWeld.cs
new file mode 100644
index 0000000..7838d71
--- /dev/null
+++ b/GroupLine.Model/TermWeld.cs
@@ -0,0 +1,57 @@
+using FreeSql.DataAnnotations;
+using System;
+
+namespace GroupLine.Model
+{
+    /// <summary>
+    /// 端子凸焊
+    /// </summary>
+    [Table(Name = "dbo.TermWeld")]
+    [Index("IX_CreateTime", "CreateTime", false)]
+    public class TermWeld
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        [Column(IsIdentity = true)]
+        public long Id { get; set; }
+
+        /// <summary>
+        /// 机种名
+        /// </summary>
+        [Column(DbType = "nvarchar(8)")]
+        public string MachineModel { get; set; }
+        /// <summary>
+        /// 焊接工位
+        /// </summary>
+        [Column(DbType = "int")]
+        public int WeldStation { get; set; }
+        /// <summary>
+        /// 员工编号
+        /// </summary>
+        [Column(DbType = "nvarchar(6)")]
+        public string OpNo { get; set; }
+        /// <summary>
+        /// 电流值
+        /// </summary>
+        [Column(DbType = "decimal(8,2)")]
+        public decimal Cur { get; set; }
+        /// <summary>
+        /// 电极型号
+        /// </summary>
+        [Column(DbType = "int")]
+        public int ElectrodeModel { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime DEFAULT(GETDATE())")]
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 焊接时间
+        /// </summary>
+        [Column(DbType = "decimal(8,2)")]
+        public decimal WeldTime { get; set; }
+
+    }
+}
diff --git a/GroupLine.Model/packages.config b/GroupLine.Model/packages.config
new file mode 100644
index 0000000..8201349
--- /dev/null
+++ b/GroupLine.Model/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FreeSql" version="3.2.692" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/GroupLine.sln b/GroupLine.sln
new file mode 100644
index 0000000..576d352
--- /dev/null
+++ b/GroupLine.sln
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33213.308
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupLine.App", "GroupLine.App\GroupLine.App.csproj", "{BDF65038-979E-4922-B285-089193C1A1F4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupLine.Com", "GroupLine.Com\GroupLine.Com.csproj", "{D952EFF3-E90D-48CE-92E5-76E1BA4AB609}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GroupLine.Model", "GroupLine.Model\GroupLine.Model.csproj", "{7B3AC8E7-3CDA-4D30-8D65-42092AA62BB9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{BDF65038-979E-4922-B285-089193C1A1F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDF65038-979E-4922-B285-089193C1A1F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDF65038-979E-4922-B285-089193C1A1F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDF65038-979E-4922-B285-089193C1A1F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D952EFF3-E90D-48CE-92E5-76E1BA4AB609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D952EFF3-E90D-48CE-92E5-76E1BA4AB609}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D952EFF3-E90D-48CE-92E5-76E1BA4AB609}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D952EFF3-E90D-48CE-92E5-76E1BA4AB609}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7B3AC8E7-3CDA-4D30-8D65-42092AA62BB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7B3AC8E7-3CDA-4D30-8D65-42092AA62BB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7B3AC8E7-3CDA-4D30-8D65-42092AA62BB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7B3AC8E7-3CDA-4D30-8D65-42092AA62BB9}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {6586F176-C3A7-483B-BC3B-10BF69A3BF3D}
+	EndGlobalSection
+EndGlobal