1. 업무일지 작업형태 선택 ui 변경
2. 작업형태 목록 편집 UI 추가 3. 스케쥴 관련메일 발송주기를 15분에서 30분으로 변경하고 18시 이후에는 발송하지 않게 한다(최근 오류메세지가 수신된다)
This commit is contained in:
chi
@@ -113,7 +113,7 @@ ORDER BY name, pdate</CommandText>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Common" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" 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">
|
||||
<DeleteCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))</CommandText>
|
||||
<CommandText>DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_svalue2 = 1 AND [svalue2] IS NULL) OR ([svalue2] = @Original_svalue2)))</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
@@ -131,13 +131,15 @@ ORDER BY name, pdate</CommandText>
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_svalue2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="true" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_svalue2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</DeleteCommand>
|
||||
<InsertCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>INSERT INTO [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate);
|
||||
SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY code</CommandText>
|
||||
<CommandText>INSERT INTO [Common] ([gcode], [grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate], [svalue2]) VALUES (@gcode, @grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate, @svalue2);
|
||||
SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2 FROM Common WITH (nolock) WHERE (idx = SCOPE_IDENTITY()) ORDER BY code</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -148,12 +150,16 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@svalue2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</InsertCommand>
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (gcode = @gcode) AND (grp = @grp) ORDER BY code</CommandText>
|
||||
<CommandText>SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2
|
||||
FROM Common WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (grp = @grp)
|
||||
ORDER BY code</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Common" 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="grp" ColumnName="grp" DataSourceName="EE.dbo.Common" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -162,8 +168,8 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
|
||||
</SelectCommand>
|
||||
<UpdateCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="false">
|
||||
<CommandText>UPDATE [Common] SET [gcode] = @gcode, [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate));
|
||||
SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WITH (nolock) WHERE (idx = @idx) ORDER BY code</CommandText>
|
||||
<CommandText>UPDATE [Common] SET [gcode] = @gcode, [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [svalue2] = @svalue2 WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_svalue = 1 AND [svalue] IS NULL) OR ([svalue] = @Original_svalue)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_svalue2 = 1 AND [svalue2] IS NULL) OR ([svalue2] = @Original_svalue2)));
|
||||
SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2 FROM Common WITH (nolock) WHERE (idx = @idx) ORDER BY code</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
@@ -174,6 +180,7 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@svalue2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_idx" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_grp" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="grp" SourceColumnNullMapping="true" SourceVersion="Original" />
|
||||
@@ -190,6 +197,8 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_memo" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="memo" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_wuid" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="wuid" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_wdate" Precision="0" ProviderType="SmallDateTime" Scale="0" Size="0" SourceColumn="wdate" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_svalue2" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="true" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_svalue2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="svalue2" SourceColumnNullMapping="false" SourceVersion="Original" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="idx" ColumnName="idx" DataSourceName="EE.dbo.Common" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@idx" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="idx" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
@@ -207,8 +216,25 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
|
||||
<Mapping SourceColumn="memo" DataSetColumn="memo" />
|
||||
<Mapping SourceColumn="wuid" DataSetColumn="wuid" />
|
||||
<Mapping SourceColumn="wdate" DataSetColumn="wdate" />
|
||||
<Mapping SourceColumn="svalue2" DataSetColumn="svalue2" />
|
||||
</Mappings>
|
||||
<Sources />
|
||||
<Sources>
|
||||
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Common" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByJobProcess" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetByJobProcess" GeneratorSourceName="FillByJobProcess" GetMethodModifier="Public" GetMethodName="GetByJobProcess" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetByJobProcess" UserSourceName="FillByJobProcess">
|
||||
<SelectCommand>
|
||||
<DbCommand CommandType="Text" ModifiedByUser="true">
|
||||
<CommandText>SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, svalue2
|
||||
FROM Common WITH (nolock)
|
||||
WHERE (gcode = @gcode) AND (grp = @grp) AND (ISNULL(svalue2, '') = @jobtype)
|
||||
ORDER BY code</CommandText>
|
||||
<Parameters>
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Common" 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="grp" ColumnName="grp" DataSourceName="EE.dbo.Common" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@grp" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="grp" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
<Parameter AllowDbNull="false" AutogeneratedName="jobtype" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@jobtype" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
|
||||
</Parameters>
|
||||
</DbCommand>
|
||||
</SelectCommand>
|
||||
</DbSource>
|
||||
</Sources>
|
||||
</TableAdapter>
|
||||
</Tables>
|
||||
<Sources />
|
||||
@@ -418,6 +444,13 @@ SELECT idx, gcode, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Com
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
<xs:element name="wdate" msprop:Generator_ColumnPropNameInTable="wdateColumn" msprop:Generator_ColumnPropNameInRow="wdate" msprop:Generator_UserColumnName="wdate" msprop:Generator_ColumnVarNameInTable="columnwdate" type="xs:dateTime" />
|
||||
<xs:element name="svalue2" msprop:Generator_ColumnPropNameInTable="svalue2Column" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="svalue2" msprop:Generator_UserColumnName="svalue2" msprop:Generator_ColumnVarNameInTable="columnsvalue2" minOccurs="0">
|
||||
<xs:simpleType>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:maxLength value="1000" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
Reference in New Issue
Block a user