This commit is contained in:
chi
2025-01-14 16:25:43 +09:00
parent eb82bbf158
commit 1c74f81479
5 changed files with 264 additions and 147 deletions

View File

@@ -106,7 +106,8 @@ WHERE (idx = @Original_idx)</CommandText>
ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible,
(SELECT MAX(pdate) AS Expr1
FROM ProjectsHistory
WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem
WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem, dbo.getLastProjectScheduleNo(gcode, idx)
AS lastSchNo
FROM Projects WITH (nolock)
WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR
ISNULL(usermain, '') LIKE @username OR
@@ -298,6 +299,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat
<Mapping SourceColumn="sfi_shiftcount" DataSetColumn="sfi_shiftcount" />
<Mapping SourceColumn="sfic" DataSetColumn="sfic" />
<Mapping SourceColumn="bmajoritem" DataSetColumn="bmajoritem" />
<Mapping SourceColumn="lastSchNo" DataSetColumn="lastSchNo" />
</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">
@@ -320,7 +322,17 @@ WHERE (import = 1) AND (gcode = @gcode)</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByIDX" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetbyIDX" GeneratorSourceName="FillByIDX" GetMethodModifier="Public" GetMethodName="GetbyIDX" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetbyIDX" UserSourceName="FillByIDX">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx)</CommandText>
<CommandText>SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut,
bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode,
idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory,
(SELECT MAX(pdate) AS Expr1
FROM ProjectsHistory
WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion,
dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno,
process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager,
userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo
FROM Projects WITH (nolock)
WHERE (idx = @idx)</CommandText>
<Parameters>
<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="Current" />
</Parameters>
@@ -330,7 +342,19 @@ WHERE (import = 1) AND (gcode = @gcode)</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.Projects" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillSearch" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetSearch" GeneratorSourceName="FillSearch" GetMethodModifier="Public" GetMethodName="GetSearch" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetSearch" UserSourceName="FillSearch">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)</CommandText>
<CommandText>SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut,
bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode,
idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory,
(SELECT MAX(pdate) AS Expr1
FROM ProjectsHistory
WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion,
dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno,
process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager,
userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws, dbo.getLastProjectScheduleNo(gcode, idx) AS lastSchNo
FROM Projects WITH (nolock)
WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR
(ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR
(ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="search" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="String" Direction="Input" ParameterName="@search" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<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" />
@@ -3541,6 +3565,7 @@ WHERE (idx = @idx)</CommandText>
<xs:element name="sfi_shiftcount" msprop:Generator_ColumnPropNameInTable="sfi_shiftcountColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sfi_shiftcount" msprop:Generator_UserColumnName="sfi_shiftcount" msprop:Generator_ColumnVarNameInTable="columnsfi_shiftcount" type="xs:double" minOccurs="0" />
<xs:element name="sfic" msprop:Generator_ColumnPropNameInTable="sficColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="sfic" msprop:Generator_UserColumnName="sfic" msprop:Generator_ColumnVarNameInTable="columnsfic" type="xs:double" minOccurs="0" />
<xs:element name="bmajoritem" msprop:Generator_ColumnPropNameInTable="bmajoritemColumn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="bmajoritem" msprop:Generator_UserColumnName="bmajoritem" msprop:Generator_ColumnVarNameInTable="columnbmajoritem" type="xs:boolean" minOccurs="0" />
<xs:element name="lastSchNo" msdata:ReadOnly="true" msprop:Generator_ColumnPropNameInRow="lastSchNo" msprop:Generator_ColumnPropNameInTable="lastSchNoColumn" msprop:Generator_ColumnVarNameInTable="columnlastSchNo" msprop:Generator_UserColumnName="lastSchNo" type="xs:int" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>