사용자목록DB를 Et 에서 dataset 으로 변경함 ,et에서 오는 목록의데이터가 이상하다;; 수량은 맞는데 내용이 1번 데이터하고 모두 동일 하다
This commit is contained in:
@@ -7,9 +7,9 @@
|
|||||||
<Diagram DiagramId="1357493607fd4a93b6b3d9fc19689b4f" Name="Diagram1">
|
<Diagram DiagramId="1357493607fd4a93b6b3d9fc19689b4f" Name="Diagram1">
|
||||||
<EntityTypeShape EntityType="EEModelMain.EETGW_GroupUser" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
|
<EntityTypeShape EntityType="EEModelMain.EETGW_GroupUser" Width="1.5" PointX="0.75" PointY="0.75" IsExpanded="true" />
|
||||||
<EntityTypeShape EntityType="EEModelMain.UserGroup" Width="1.5" PointX="2.75" PointY="0.75" IsExpanded="true" />
|
<EntityTypeShape EntityType="EEModelMain.UserGroup" Width="1.5" PointX="2.75" PointY="0.75" IsExpanded="true" />
|
||||||
<EntityTypeShape EntityType="EEModelMain.Users" Width="1.5" PointX="2.75" PointY="3.75" IsExpanded="true" />
|
<EntityTypeShape EntityType="EEModelMain.Users" Width="1.5" PointX="9.5" PointY="0.875" IsExpanded="true" />
|
||||||
<EntityTypeShape EntityType="EEModelMain.vGroupUser" Width="1.5" PointX="4.75" PointY="0.75" IsExpanded="true" />
|
<EntityTypeShape EntityType="EEModelMain.vGroupUser" Width="1.5" PointX="4.75" PointY="0.75" IsExpanded="true" />
|
||||||
<EntityTypeShape EntityType="EEModelMain.EETGW_LoginInfo" Width="1.5" PointX="5.375" PointY="6.75" />
|
<EntityTypeShape EntityType="EEModelMain.EETGW_LoginInfo" Width="1.5" PointX="7.5" PointY="0.5" />
|
||||||
</Diagram>
|
</Diagram>
|
||||||
</edmx:Diagrams>
|
</edmx:Diagrams>
|
||||||
</edmx:Designer>
|
</edmx:Designer>
|
||||||
|
|||||||
2017
Project/DataSet1.Designer.cs
generated
2017
Project/DataSet1.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@@ -3,8 +3,50 @@
|
|||||||
<xs:annotation>
|
<xs:annotation>
|
||||||
<xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
|
<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">
|
<DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
|
||||||
<Connections />
|
<Connections>
|
||||||
<Tables />
|
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="gwcs" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="gwcs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.Project.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">
|
||||||
|
<MainSource>
|
||||||
|
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vGroupUser" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
|
||||||
|
<SelectCommand>
|
||||||
|
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||||
|
<CommandText>SELECT gcode, dept, level, name, nameE, grade, email, tel, indate, outdate, hp, place, ads_employNo, ads_title, ads_created, memo, processs, id
|
||||||
|
FROM vGroupUser
|
||||||
|
WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs, '') LIKE @processs)</CommandText>
|
||||||
|
<Parameters>
|
||||||
|
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vGroupUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||||
|
<Parameter AllowDbNull="false" AutogeneratedName="dept" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@dept" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||||
|
<Parameter AllowDbNull="false" AutogeneratedName="processs" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@processs" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||||
|
</Parameters>
|
||||||
|
</DbCommand>
|
||||||
|
</SelectCommand>
|
||||||
|
</DbSource>
|
||||||
|
</MainSource>
|
||||||
|
<Mappings>
|
||||||
|
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
|
||||||
|
<Mapping SourceColumn="dept" DataSetColumn="dept" />
|
||||||
|
<Mapping SourceColumn="level" DataSetColumn="level" />
|
||||||
|
<Mapping SourceColumn="name" DataSetColumn="name" />
|
||||||
|
<Mapping SourceColumn="nameE" DataSetColumn="nameE" />
|
||||||
|
<Mapping SourceColumn="grade" DataSetColumn="grade" />
|
||||||
|
<Mapping SourceColumn="email" DataSetColumn="email" />
|
||||||
|
<Mapping SourceColumn="tel" DataSetColumn="tel" />
|
||||||
|
<Mapping SourceColumn="indate" DataSetColumn="indate" />
|
||||||
|
<Mapping SourceColumn="outdate" DataSetColumn="outdate" />
|
||||||
|
<Mapping SourceColumn="hp" DataSetColumn="hp" />
|
||||||
|
<Mapping SourceColumn="place" DataSetColumn="place" />
|
||||||
|
<Mapping SourceColumn="ads_employNo" DataSetColumn="ads_employNo" />
|
||||||
|
<Mapping SourceColumn="ads_title" DataSetColumn="ads_title" />
|
||||||
|
<Mapping SourceColumn="ads_created" DataSetColumn="ads_created" />
|
||||||
|
<Mapping SourceColumn="memo" DataSetColumn="memo" />
|
||||||
|
<Mapping SourceColumn="processs" DataSetColumn="processs" />
|
||||||
|
<Mapping SourceColumn="id" DataSetColumn="id" />
|
||||||
|
</Mappings>
|
||||||
|
<Sources />
|
||||||
|
</TableAdapter>
|
||||||
|
</Tables>
|
||||||
<Sources />
|
<Sources />
|
||||||
</DataSource>
|
</DataSource>
|
||||||
</xs:appinfo>
|
</xs:appinfo>
|
||||||
@@ -45,6 +87,132 @@
|
|||||||
</xs:sequence>
|
</xs:sequence>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
</xs:element>
|
</xs:element>
|
||||||
|
<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">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="10" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="dept" msprop:Generator_ColumnVarNameInTable="columndept" msprop:Generator_ColumnPropNameInRow="dept" msprop:Generator_ColumnPropNameInTable="deptColumn" msprop:Generator_UserColumnName="dept" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="100" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="level" msprop:Generator_ColumnVarNameInTable="columnlevel" msprop:Generator_ColumnPropNameInRow="level" msprop:Generator_ColumnPropNameInTable="levelColumn" msprop:Generator_UserColumnName="level" type="xs:short" minOccurs="0" />
|
||||||
|
<xs:element name="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" msprop:Generator_UserColumnName="name" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="100" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="nameE" msprop:Generator_ColumnVarNameInTable="columnnameE" msprop:Generator_ColumnPropNameInRow="nameE" msprop:Generator_ColumnPropNameInTable="nameEColumn" msprop:Generator_UserColumnName="nameE" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="100" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="grade" msprop:Generator_ColumnVarNameInTable="columngrade" msprop:Generator_ColumnPropNameInRow="grade" msprop:Generator_ColumnPropNameInTable="gradeColumn" msprop:Generator_UserColumnName="grade" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="10" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnPropNameInTable="emailColumn" msprop:Generator_UserColumnName="email" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="100" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="tel" msprop:Generator_ColumnVarNameInTable="columntel" msprop:Generator_ColumnPropNameInRow="tel" msprop:Generator_ColumnPropNameInTable="telColumn" msprop:Generator_UserColumnName="tel" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="20" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="indate" msprop:Generator_ColumnVarNameInTable="columnindate" msprop:Generator_ColumnPropNameInRow="indate" msprop:Generator_ColumnPropNameInTable="indateColumn" msprop:Generator_UserColumnName="indate" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="20" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="outdate" msprop:Generator_ColumnVarNameInTable="columnoutdate" msprop:Generator_ColumnPropNameInRow="outdate" msprop:Generator_ColumnPropNameInTable="outdateColumn" msprop:Generator_UserColumnName="outdate" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="20" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="hp" msprop:Generator_ColumnVarNameInTable="columnhp" msprop:Generator_ColumnPropNameInRow="hp" msprop:Generator_ColumnPropNameInTable="hpColumn" msprop:Generator_UserColumnName="hp" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="20" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="place" msprop:Generator_ColumnVarNameInTable="columnplace" msprop:Generator_ColumnPropNameInRow="place" msprop:Generator_ColumnPropNameInTable="placeColumn" msprop:Generator_UserColumnName="place" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="100" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="ads_employNo" msprop:Generator_ColumnVarNameInTable="columnads_employNo" msprop:Generator_ColumnPropNameInRow="ads_employNo" msprop:Generator_ColumnPropNameInTable="ads_employNoColumn" msprop:Generator_UserColumnName="ads_employNo" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="50" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="ads_title" msprop:Generator_ColumnVarNameInTable="columnads_title" msprop:Generator_ColumnPropNameInRow="ads_title" msprop:Generator_ColumnPropNameInTable="ads_titleColumn" msprop:Generator_UserColumnName="ads_title" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="100" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="ads_created" msprop:Generator_ColumnVarNameInTable="columnads_created" msprop:Generator_ColumnPropNameInRow="ads_created" msprop:Generator_ColumnPropNameInTable="ads_createdColumn" msprop:Generator_UserColumnName="ads_created" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="50" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="memo" msprop:Generator_ColumnVarNameInTable="columnmemo" msprop:Generator_ColumnPropNameInRow="memo" msprop:Generator_ColumnPropNameInTable="memoColumn" msprop:Generator_UserColumnName="memo" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="255" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="processs" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnprocesss" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:Generator_UserColumnName="processs" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="50" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
<xs:element name="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" msprop:Generator_UserColumnName="id" minOccurs="0">
|
||||||
|
<xs:simpleType>
|
||||||
|
<xs:restriction base="xs:string">
|
||||||
|
<xs:maxLength value="20" />
|
||||||
|
</xs:restriction>
|
||||||
|
</xs:simpleType>
|
||||||
|
</xs:element>
|
||||||
|
</xs:sequence>
|
||||||
|
</xs:complexType>
|
||||||
|
</xs:element>
|
||||||
</xs:choice>
|
</xs:choice>
|
||||||
</xs:complexType>
|
</xs:complexType>
|
||||||
<xs:unique name="Constraint11">
|
<xs:unique name="Constraint11">
|
||||||
|
|||||||
@@ -6,9 +6,10 @@
|
|||||||
</autogenerated>-->
|
</autogenerated>-->
|
||||||
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" 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="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||||
<Shapes>
|
<Shapes>
|
||||||
<Shape ID="DesignTable:ResultData" ZOrder="3" X="0" Y="0" Height="258" Width="169" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
<Shape ID="DesignTable:vGroupUser" ZOrder="1" X="375" Y="157" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||||
<Shape ID="DesignTable:Users" ZOrder="2" X="191" Y="5" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
|
<Shape ID="DesignTable:ResultData" ZOrder="4" X="0" Y="0" Height="258" Width="169" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||||
<Shape ID="DesignTable:Model" ZOrder="1" X="355" Y="5" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
|
<Shape ID="DesignTable:Users" ZOrder="3" X="191" Y="5" Height="105" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="101" />
|
||||||
|
<Shape ID="DesignTable:Model" ZOrder="2" X="355" Y="5" Height="86" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="82" />
|
||||||
</Shapes>
|
</Shapes>
|
||||||
<Connectors />
|
<Connectors />
|
||||||
</DiagramLayout>
|
</DiagramLayout>
|
||||||
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
|||||||
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
|
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
|
||||||
// 지정되도록 할 수 있습니다.
|
// 지정되도록 할 수 있습니다.
|
||||||
// [assembly: AssemblyVersion("1.0.*")]
|
// [assembly: AssemblyVersion("1.0.*")]
|
||||||
[assembly: AssemblyVersion("20.11.30.1530")]
|
[assembly: AssemblyVersion("20.12.16.0930")]
|
||||||
[assembly: AssemblyFileVersion("20.11.30.1530")]
|
[assembly: AssemblyFileVersion("20.12.16.0930")]
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ namespace Project
|
|||||||
idx = i;
|
idx = i;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (idx == -1) this.startForm = eFormList.없음;
|
if (idx == -1) this.startForm = eFormList.업무일지;
|
||||||
else this.startForm = (eFormList)idx;
|
else this.startForm = (eFormList)idx;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -176,16 +176,22 @@ namespace Project._Common
|
|||||||
if (tbProcess.Text.Trim() == "") tbProcess.Text = "%";
|
if (tbProcess.Text.Trim() == "") tbProcess.Text = "%";
|
||||||
this.dsMSSQL.Users.Clear();
|
this.dsMSSQL.Users.Clear();
|
||||||
|
|
||||||
var db = new EEEntitiesMain();
|
//var db = new EEEntitiesMain();
|
||||||
if (tbProcess.Text.Trim() != "" && tbProcess.Text.Trim() != "%")
|
//IQueryable<vGroupUser> userlist = null; // db.vGroupUser.Where(t => t.dept == this.cmbdept.Text && t.processs.Contains(tbProcess.Text.Trim())).ToList();
|
||||||
this.bs.DataSource = db.vGroupUser.Where(t => t.dept == this.cmbdept.Text && t.processs.Contains(tbProcess.Text.Trim()));
|
//if (tbProcess.Text.Trim() != "" && tbProcess.Text.Trim() != "%")
|
||||||
else
|
// userlist = db.vGroupUser.Where(t => t.dept == this.cmbdept.Text && t.processs.Contains(tbProcess.Text.Trim()));
|
||||||
this.bs.DataSource = db.vGroupUser.Where(t => t.dept == this.cmbdept.Text);
|
//else
|
||||||
|
// userlist = db.vGroupUser.Where(t => t.dept == this.cmbdept.Text);
|
||||||
|
|
||||||
|
//var ll = userlist.ToArray();
|
||||||
|
|
||||||
|
//this.bs.DataSource = userlist;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
this.ta.Fill(this.dsMSSQL.Users, this.cmbdept.Text, tbProcess.Text.Trim());
|
||||||
//this.ta.Fill(this.dsMSSQL.Users, this.cmbdept.Text, tbProcess.Text.Trim());
|
this.dsMSSQL.Users.AcceptChanges();
|
||||||
//this.dsMSSQL.Users.AcceptChanges();
|
|
||||||
this.dv1.AutoResizeColumns();
|
this.dv1.AutoResizeColumns();
|
||||||
}
|
}
|
||||||
private void autoResizeColumnToolStripMenuItem_Click(object sender, EventArgs e)
|
private void autoResizeColumnToolStripMenuItem_Click(object sender, EventArgs e)
|
||||||
|
|||||||
1628
Project/dsMSSQL.Designer.cs
generated
1628
Project/dsMSSQL.Designer.cs
generated
File diff suppressed because it is too large
Load Diff
@@ -6,14 +6,14 @@
|
|||||||
</autogenerated>-->
|
</autogenerated>-->
|
||||||
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" 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="-10" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
|
||||||
<Shapes>
|
<Shapes>
|
||||||
<Shape ID="DesignTable:Users" ZOrder="4" X="958" Y="53" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
|
<Shape ID="DesignTable:Users" ZOrder="1" X="998" Y="60" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
|
||||||
<Shape ID="DesignTable:Projects" ZOrder="9" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
|
<Shape ID="DesignTable:Projects" ZOrder="9" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
|
||||||
<Shape ID="DesignTable:Items" ZOrder="8" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
|
<Shape ID="DesignTable:Items" ZOrder="8" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
|
||||||
<Shape ID="DesignTable:Inventory" ZOrder="7" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
|
<Shape ID="DesignTable:Inventory" ZOrder="7" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
|
||||||
<Shape ID="DesignTable:LineCode" ZOrder="6" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
|
<Shape ID="DesignTable:LineCode" ZOrder="6" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
|
||||||
<Shape ID="DesignTable:UserGroup" ZOrder="3" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
|
<Shape ID="DesignTable:UserGroup" ZOrder="4" 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="772" Y="337" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
<Shape ID="DesignTable:SPMaster" ZOrder="3" X="772" Y="337" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
|
||||||
<Shape ID="DesignTable:EETGW_GroupUser" ZOrder="1" X="861" Y="34" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
|
<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="DesignSources:QueriesTableAdapter" ZOrder="5" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
|
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="5" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
|
||||||
</Shapes>
|
</Shapes>
|
||||||
<Connectors />
|
<Connectors />
|
||||||
|
|||||||
@@ -420,7 +420,6 @@ namespace FPJ0000.JobReport
|
|||||||
var predr = lastDt.Rows[0];// as dsPRJ.JobReportRow;
|
var predr = lastDt.Rows[0];// as dsPRJ.JobReportRow;
|
||||||
if (predr["process"] != DBNull.Value)
|
if (predr["process"] != DBNull.Value)
|
||||||
cmbProcess.Text = predr["process"].ToString(); //190506
|
cmbProcess.Text = predr["process"].ToString(); //190506
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user