문자편집기 창 별도 추가했음,
휴가내역 정렬 수정
This commit is contained in:
chi
@@ -24,8 +24,8 @@ WHERE (idx = @Original_idx)</CommandText>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>INSERT INTO Projects
|
||||
(status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
|
||||
progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess)
|
||||
VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess);
|
||||
progress, import, asset, isdel, path, userhw2, orderno, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut)
|
||||
VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate,@memo,@wuid,@wdate,@rev,@pidx,@userManager,@level,@part,@process,@costo,@costn,@cnt,@remark_req,@remark_ans,@ddate,@progress,@import,@asset,@isdel,@path,@userhw2,@orderno,@gcode,@category,@userprocess,@CMP_Background,@CMP_Description,@CMP_Before,@CMP_After,@bCost,@bFanOut);
|
||||
SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -62,13 +62,20 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Projects" 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="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</InsertCommand>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
|
||||
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
|
||||
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
|
||||
bCost, bFanOut
|
||||
FROM Projects
|
||||
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
|
||||
ISNULL(usermain, '') LIKE @username OR
|
||||
@@ -88,8 +95,9 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN
|
||||
SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo,
|
||||
wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt,
|
||||
remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2,
|
||||
orderno = @orderno, category = @category, userprocess = @userprocess
|
||||
WHERE (idx = @Original_idx);
|
||||
orderno = @orderno, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before,
|
||||
CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut
|
||||
WHERE (idx = @Original_idx);
|
||||
SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2 FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END)</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="status" ColumnName="status" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@status" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="status" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -125,6 +133,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="orderno" ColumnName="orderno" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@orderno" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="orderno" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="category" ColumnName="category" DataSourceName="EE.dbo.Projects" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@category" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="category" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="userprocess" ColumnName="userprocess" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(100)" DbType="String" Direction="Input" ParameterName="@userprocess" Precision="0" ProviderType="NVarChar" Scale="0" Size="100" SourceColumn="userprocess" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Background" ColumnName="CMP_Background" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Background" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Background" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Description" ColumnName="CMP_Description" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Description" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Description" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="CMP_Before" ColumnName="CMP_Before" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_Before" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_Before" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="CMP_After" ColumnName="CMP_After" DataSourceName="EE.dbo.Projects" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@CMP_After" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="CMP_After" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="bCost" ColumnName="bCost" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bCost" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bCost" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="bFanOut" ColumnName="bFanOut" DataSourceName="EE.dbo.Projects" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@bFanOut" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="bFanOut" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="Original_idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Projects" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
</Parameters>
|
||||
@@ -169,6 +183,12 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
|
||||
<Mapping SourceColumn="gcode" DataSetColumn="gcode" />
|
||||
<Mapping SourceColumn="category" DataSetColumn="category" />
|
||||
<Mapping SourceColumn="userprocess" DataSetColumn="userprocess" />
|
||||
<Mapping SourceColumn="CMP_Background" DataSetColumn="CMP_Background" />
|
||||
<Mapping SourceColumn="CMP_Description" DataSetColumn="CMP_Description" />
|
||||
<Mapping SourceColumn="CMP_Before" DataSetColumn="CMP_Before" />
|
||||
<Mapping SourceColumn="CMP_After" DataSetColumn="CMP_After" />
|
||||
<Mapping SourceColumn="bCost" DataSetColumn="bCost" />
|
||||
<Mapping SourceColumn="bFanOut" DataSetColumn="bFanOut" />
|
||||
</Mappings>
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteImport" Modifier="Public" Name="DeleteImport" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteImport">
|
||||
@@ -192,7 +212,8 @@ WHERE (import = 1) AND (gcode = @gcode)</CommandText>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status,
|
||||
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
|
||||
userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
|
||||
bCost, bFanOut
|
||||
FROM Projects
|
||||
WHERE (idx = @idx)</CommandText>
|
||||
<Parameters>
|
||||
@@ -205,7 +226,8 @@ WHERE (idx = @idx)</CommandText>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate,
|
||||
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess
|
||||
progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After,
|
||||
bCost, bFanOut
|
||||
FROM Projects
|
||||
WHERE (ISNULL(name, N'') LIKE @search OR
|
||||
ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)</CommandText>
|
||||
@@ -1476,6 +1498,36 @@ SELECT idx, gcode, pdate, uid, description, description2, share, wuid, wdate FRO
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="CMP_Background" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CMP_Background" msprop:Generator_ColumnVarNameInTable="columnCMP_Background" msprop:Generator_ColumnPropNameInTable="CMP_BackgroundColumn" msprop:Generator_UserColumnName="CMP_Background" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="2147483647" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="CMP_Description" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CMP_Description" msprop:Generator_ColumnVarNameInTable="columnCMP_Description" msprop:Generator_ColumnPropNameInTable="CMP_DescriptionColumn" msprop:Generator_UserColumnName="CMP_Description" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="2147483647" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="CMP_Before" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CMP_Before" msprop:Generator_ColumnVarNameInTable="columnCMP_Before" msprop:Generator_ColumnPropNameInTable="CMP_BeforeColumn" msprop:Generator_UserColumnName="CMP_Before" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="2147483647" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="CMP_After" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="CMP_After" msprop:Generator_ColumnVarNameInTable="columnCMP_After" msprop:Generator_ColumnPropNameInTable="CMP_AfterColumn" msprop:Generator_UserColumnName="CMP_After" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="2147483647" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="bCost" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="bCost" msprop:Generator_ColumnVarNameInTable="columnbCost" msprop:Generator_ColumnPropNameInTable="bCostColumn" msprop:Generator_UserColumnName="bCost" type="xs:boolean" minOccurs="0" />
|
||||
<xs:element name="bFanOut" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="bFanOut" msprop:Generator_ColumnVarNameInTable="columnbFanOut" msprop:Generator_ColumnPropNameInTable="bFanOutColumn" msprop:Generator_UserColumnName="bFanOut" type="xs:boolean" minOccurs="0" />
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
Reference in New Issue
Block a user