This commit is contained in:
chi
2021-06-17 09:36:17 +09:00
parent 71b362c05b
commit 139c48721f
25 changed files with 5556 additions and 904 deletions

View File

@@ -39,5 +39,6 @@ namespace Project
public virtual DbSet<ProjectsMailList> ProjectsMailList { get; set; }
public virtual DbSet<ProjectsPart> ProjectsPart { get; set; }
public virtual DbSet<Purchase> Purchase { get; set; }
public virtual DbSet<HolidayLIst> HolidayLIst { get; set; }
}
}

View File

@@ -60,6 +60,17 @@
<Property Name="wuid" Type="varchar" MaxLength="20" />
<Property Name="wdate" Type="smalldatetime" />
</EntityType>
<EntityType Name="HolidayLIst">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="pdate" Type="varchar" MaxLength="10" />
<Property Name="free" Type="bit" />
<Property Name="memo" Type="nvarchar" MaxLength="255" />
<Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
<Property Name="wdate" Type="smalldatetime" Nullable="false" />
</EntityType>
<EntityType Name="JobReport">
<Key>
<PropertyRef Name="idx" />
@@ -141,6 +152,7 @@
<Property Name="EB_RepairTime" Type="float" />
<Property Name="EB_ConstNew" Type="float" />
<Property Name="EB_BoardName" Type="nvarchar" MaxLength="255" />
<Property Name="bAlert" Type="bit" />
</EntityType>
<EntityType Name="ProjectsHistory">
<Key>
@@ -350,6 +362,7 @@
<EntitySet Name="EETGW_GroupUser" EntityType="Self.EETGW_GroupUser" Schema="dbo" store:Type="Tables" />
<EntitySet Name="EETGW_JobReport_AutoInput" EntityType="Self.EETGW_JobReport_AutoInput" Schema="dbo" store:Type="Tables" />
<EntitySet Name="EETGW_LoginInfo" EntityType="Self.EETGW_LoginInfo" Schema="dbo" store:Type="Tables" />
<EntitySet Name="HolidayLIst" EntityType="Self.HolidayLIst" Schema="dbo" store:Type="Tables" />
<EntitySet Name="JobReport" EntityType="Self.JobReport" Schema="dbo" store:Type="Tables" />
<EntitySet Name="Projects" EntityType="Self.Projects" Schema="dbo" store:Type="Tables" />
<EntitySet Name="ProjectsHistory" EntityType="Self.ProjectsHistory" Schema="dbo" store:Type="Tables" />
@@ -430,6 +443,7 @@
<EntitySet Name="ProjectsMailList" EntityType="EEModelMain.ProjectsMailList" />
<EntitySet Name="ProjectsPart" EntityType="EEModelMain.ProjectsPart" />
<EntitySet Name="Purchase" EntityType="EEModelMain.Purchase" />
<EntitySet Name="HolidayLIst" EntityType="EEModelMain.HolidayLIst" />
</EntityContainer>
<EntityType Name="EETGW_LoginInfo">
<Key>
@@ -640,6 +654,7 @@
<Property Name="EB_RepairTime" Type="Double" />
<Property Name="EB_ConstNew" Type="Double" />
<Property Name="EB_BoardName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="bAlert" Type="Boolean" />
</EntityType>
<EntityType Name="ProjectsHistory">
<Key>
@@ -758,6 +773,17 @@
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
<Property Name="inqty" Type="Int32" />
</EntityType>
<EntityType Name="HolidayLIst">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="free" Type="Boolean" />
<Property Name="memo" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
</EntityType>
</Schema>
</edmx:ConceptualModels>
<!-- C-S mapping content -->
@@ -935,6 +961,7 @@
<EntitySetMapping Name="Projects">
<EntityTypeMapping TypeName="EEModelMain.Projects">
<MappingFragment StoreEntitySet="Projects">
<ScalarProperty Name="bAlert" ColumnName="bAlert" />
<ScalarProperty Name="EB_BoardName" ColumnName="EB_BoardName" />
<ScalarProperty Name="EB_ConstNew" ColumnName="EB_ConstNew" />
<ScalarProperty Name="EB_RepairTime" ColumnName="EB_RepairTime" />
@@ -1111,6 +1138,18 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="HolidayLIst">
<EntityTypeMapping TypeName="EEModelMain.HolidayLIst">
<MappingFragment StoreEntitySet="HolidayLIst">
<ScalarProperty Name="wdate" ColumnName="wdate" />
<ScalarProperty Name="wuid" ColumnName="wuid" />
<ScalarProperty Name="memo" ColumnName="memo" />
<ScalarProperty Name="free" ColumnName="free" />
<ScalarProperty Name="pdate" ColumnName="pdate" />
<ScalarProperty Name="idx" ColumnName="idx" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping>
</edmx:Mappings>

View File

@@ -19,6 +19,7 @@
<EntityTypeShape EntityType="EEModelMain.ProjectsMailList" Width="1.5" PointX="0.75" PointY="11.75" />
<EntityTypeShape EntityType="EEModelMain.ProjectsPart" Width="1.5" PointX="11.75" PointY="3.75" />
<EntityTypeShape EntityType="EEModelMain.Purchase" Width="1.5" PointX="5.75" PointY="11.75" />
<EntityTypeShape EntityType="EEModelMain.HolidayLIst" Width="1.5" PointX="12.375" PointY="11.75" />
</Diagram>
</edmx:Diagrams>
</edmx:Designer>

View File

@@ -4,7 +4,7 @@
<xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
<DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<Connections>
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="gwcs" IsAppSettingsProperty="true" Modifier="Assembly" Name="gwcs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.WebServer.Properties.Settings.GlobalReference.Default.gwcs" Provider="System.Data.SqlClient" />
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="gwcs" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="gwcs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.WebServer.Properties.Settings.GlobalReference.Default.gwcs" Provider="System.Data.SqlClient" />
</Connections>
<Tables>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="vGroupUserTableAdapter" GeneratorDataComponentClassName="vGroupUserTableAdapter" Name="vGroupUser" UserDataComponentName="vGroupUserTableAdapter">
@@ -54,7 +54,7 @@ WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs,
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="ResultData" msprop:Generator_TableClassName="ResultDataDataTable" msprop:Generator_TableVarName="tableResultData" msprop:Generator_RowChangedName="ResultDataRowChanged" msprop:Generator_TablePropName="ResultData" msprop:Generator_RowDeletingName="ResultDataRowDeleting" msprop:Generator_RowChangingName="ResultDataRowChanging" msprop:Generator_RowEvHandlerName="ResultDataRowChangeEventHandler" msprop:Generator_RowDeletedName="ResultDataRowDeleted" msprop:Generator_RowClassName="ResultDataRow" msprop:Generator_UserTableName="ResultData" msprop:Generator_RowEvArgName="ResultDataRowChangeEvent">
<xs:element name="ResultData" msprop:Generator_TableClassName="ResultDataDataTable" msprop:Generator_TableVarName="tableResultData" msprop:Generator_TablePropName="ResultData" msprop:Generator_RowDeletingName="ResultDataRowDeleting" msprop:Generator_RowChangingName="ResultDataRowChanging" msprop:Generator_RowEvHandlerName="ResultDataRowChangeEventHandler" msprop:Generator_RowDeletedName="ResultDataRowDeleted" msprop:Generator_UserTableName="ResultData" msprop:Generator_RowChangedName="ResultDataRowChanged" msprop:Generator_RowEvArgName="ResultDataRowChangeEvent" msprop:Generator_RowClassName="ResultDataRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -68,7 +68,7 @@ WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_RowClassName="UsersRow" msprop:Generator_UserTableName="Users" msprop:Generator_RowEvArgName="UsersRowChangeEvent">
<xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_UserTableName="Users" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_RowEvArgName="UsersRowChangeEvent" msprop:Generator_RowClassName="UsersRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -78,7 +78,7 @@ WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Model" msprop:Generator_TableClassName="ModelDataTable" msprop:Generator_TableVarName="tableModel" msprop:Generator_RowChangedName="ModelRowChanged" msprop:Generator_TablePropName="Model" msprop:Generator_RowDeletingName="ModelRowDeleting" msprop:Generator_RowChangingName="ModelRowChanging" msprop:Generator_RowEvHandlerName="ModelRowChangeEventHandler" msprop:Generator_RowDeletedName="ModelRowDeleted" msprop:Generator_RowClassName="ModelRow" msprop:Generator_UserTableName="Model" msprop:Generator_RowEvArgName="ModelRowChangeEvent">
<xs:element name="Model" msprop:Generator_TableClassName="ModelDataTable" msprop:Generator_TableVarName="tableModel" msprop:Generator_TablePropName="Model" msprop:Generator_RowDeletingName="ModelRowDeleting" msprop:Generator_RowChangingName="ModelRowChanging" msprop:Generator_RowEvHandlerName="ModelRowChangeEventHandler" msprop:Generator_RowDeletedName="ModelRowDeleted" msprop:Generator_UserTableName="Model" msprop:Generator_RowChangedName="ModelRowChanged" msprop:Generator_RowEvArgName="ModelRowChangeEvent" msprop:Generator_RowClassName="ModelRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -87,7 +87,7 @@ WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="vGroupUser" msprop:Generator_TableClassName="vGroupUserDataTable" msprop:Generator_TableVarName="tablevGroupUser" msprop:Generator_TablePropName="vGroupUser" msprop:Generator_RowDeletingName="vGroupUserRowDeleting" msprop:Generator_RowChangingName="vGroupUserRowChanging" msprop:Generator_RowEvHandlerName="vGroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vGroupUserRowDeleted" msprop:Generator_UserTableName="vGroupUser" msprop:Generator_RowChangedName="vGroupUserRowChanged" msprop:Generator_RowEvArgName="vGroupUserRowChangeEvent" msprop:Generator_RowClassName="vGroupUserRow">
<xs:element name="vGroupUser" msprop:Generator_TableClassName="vGroupUserDataTable" msprop:Generator_TableVarName="tablevGroupUser" msprop:Generator_RowChangedName="vGroupUserRowChanged" msprop:Generator_TablePropName="vGroupUser" msprop:Generator_RowDeletingName="vGroupUserRowDeleting" msprop:Generator_RowChangingName="vGroupUserRowChanging" msprop:Generator_RowEvHandlerName="vGroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vGroupUserRowDeleted" msprop:Generator_RowClassName="vGroupUserRow" msprop:Generator_UserTableName="vGroupUser" msprop:Generator_RowEvArgName="vGroupUserRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">

View File

@@ -137,6 +137,23 @@ namespace Project.Dialog
return;
}
if (userdr.outdate.isEmpty() == false)
{
if (DateTime.TryParse(userdr.outdate, out DateTime dtout))
{
if (DateTime.Now > dtout)
{
Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다");
return;
}
}
else
{
Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다");
return;
}
}
FCOMMON.info.Login.no = userdr.id;
FCOMMON.info.Login.nameK = userdr.name;
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
@@ -153,13 +170,13 @@ namespace Project.Dialog
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm);
FCOMMON.info.datapath = Pub.setting.SharedDataPath;
if(FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
using (var dbEnity = new EEEntitiesMain())
{
var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault();
if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자":"");
if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : "");
else FCOMMON.info.Login.process = drGrpUser.Process;
}
@@ -167,7 +184,10 @@ namespace Project.Dialog
AddLoginInfo();
//210221
MakeAutoJobReport();
MakeAutoJobReportbyLogin();
//210613
MakeAutoJobReportByAuto();
DialogResult = DialogResult.OK;
}
@@ -178,7 +198,73 @@ namespace Project.Dialog
}
}
void MakeAutoJobReport()
/// <summary>
/// 무조건 업무일지를 자동으로 작성하는 경우
/// </summary>
void MakeAutoJobReportByAuto()
{
//누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다.
var dbi = new EEEntitiesMain();
var db = new EEEntitiesMain();
var nd = DateTime.Now.ToShortDateString();
//이 날짜가 휴일인지 체크한다.
var Holyinfo = db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault();
if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) return;
//토,일은 처리하지 않음
if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return;
var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable==true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
foreach (var dr in rows)
{
//퇴사자 확인
var userdata = db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault();
if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue;
//오늘자 자동생성된 데이터가 있다면 처리하지 않는다
if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any()) continue;
//이데이터를 그대로 생성해준다.
var newdr = new JobReport();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.wuid = dr.uid;// FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = nd;
newdr.import = false;
newdr.hrs = dr.hrs;
newdr.type = dr.type;//210305 누락분 추가
newdr.ot = dr.ot;
newdr.process = dr.process;
newdr.projectName = dr.projectName;
newdr.pidx = dr.pidx;
newdr.package = dr.package;
newdr.autoinput = true;
newdr.description = dr.description;
newdr.description2 = dr.description2;
newdr.remark = dr.remark;
newdr.requestpart = dr.requestpart;
newdr.status = dr.status;
newdr.tag = dr.tag;
newdr.uid = dr.uid;
dbi.JobReport.Add(newdr);
dbi.SaveChanges();
}
dbi.Dispose();
db.Dispose();
}
/// <summary>
/// 로그인으로 업무일지를 작성하는 경우
/// </summary>
void MakeAutoJobReportbyLogin()
{
//자동로그인 업무일지 기록 기능 추가 = 210220
//select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L'
@@ -189,7 +275,7 @@ namespace Project.Dialog
t.uid == FCOMMON.info.Login.no &&
t.pdate == nd).Any() == false)
{
var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.autoinput == "L" && t.uid == FCOMMON.info.Login.no && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "L" && t.uid == FCOMMON.info.Login.no && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
foreach (var dr in rows)
{
//이데이터를 그대로 생성해준다.

View File

@@ -395,11 +395,14 @@
<Compile Include="fSetting.Designer.cs">
<DependentUpon>fSetting.cs</DependentUpon>
</Compile>
<Compile Include="HolidayLIst.cs">
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Items.cs">
<DependentUpon>ModelPurchase.tt</DependentUpon>
</Compile>
<Compile Include="JobReport.cs">
<DependentUpon>ModelJobreport.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Language\Lang.cs" />
<Compile Include="Manager\DataBaseManager.cs" />
@@ -472,22 +475,22 @@
<Compile Include="OWIN\StartupSSE.cs" />
<Compile Include="Program.cs" />
<Compile Include="Projects.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="ProjectsHistory.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="ProjectsIOMap.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="ProjectsMailList.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="ProjectsPart.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Purchase.cs">
<DependentUpon>ModelPurchase.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Settings.cs" />
<Compile Include="SqlServerTypes\Loader.cs" />

24
Project/HolidayLIst.cs Normal file
View File

@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 이 코드는 템플릿에서 생성되었습니다.
//
// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Project
{
using System;
using System.Collections.Generic;
public partial class HolidayLIst
{
public int idx { get; set; }
public string pdate { get; set; }
public Nullable<bool> free { get; set; }
public string memo { get; set; }
public string wuid { get; set; }
public System.DateTime wdate { get; set; }
}
}

View File

@@ -65,5 +65,6 @@ namespace Project
public Nullable<double> EB_RepairTime { get; set; }
public Nullable<double> EB_ConstNew { get; set; }
public string EB_BoardName { get; set; }
public Nullable<bool> bAlert { get; set; }
}
}

View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("21.05.31.1330")]
[assembly: AssemblyFileVersion("21.05.31.1330")]
[assembly: AssemblyVersion("21.06.17.0920")]
[assembly: AssemblyFileVersion("21.06.17.0920")]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -4,18 +4,19 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-8" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="2" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Users" ZOrder="5" X="998" Y="60" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
<Shape ID="DesignTable:Projects" ZOrder="10" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
<Shape ID="DesignTable:Items" ZOrder="4" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:Inventory" ZOrder="9" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:LineCode" ZOrder="1" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
<Shape ID="DesignTable:UserGroup" ZOrder="7" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
<Shape ID="DesignTable:SPMaster" ZOrder="6" X="772" Y="337" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_GroupUser" ZOrder="2" X="861" Y="34" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vGroupUser" ZOrder="3" X="938" Y="-5" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="8" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Users" ZOrder="3" X="997" Y="61" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
<Shape ID="DesignTable:Projects" ZOrder="11" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
<Shape ID="DesignTable:Items" ZOrder="7" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:Inventory" ZOrder="10" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:LineCode" ZOrder="4" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
<Shape ID="DesignTable:UserGroup" ZOrder="8" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
<Shape ID="DesignTable:SPMaster" ZOrder="2" X="802" Y="331" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_GroupUser" ZOrder="5" X="12" Y="283" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vGroupUser" ZOrder="6" X="938" Y="-5" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="9" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:JobReport" ZOrder="1" X="1232" Y="18" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
</Shapes>
<Connectors />
</DiagramLayout>