This commit is contained in:
chi
2022-12-15 08:27:20 +09:00
parent 742b3f5c5e
commit b7092ab514
15 changed files with 4128 additions and 2664 deletions

View File

@@ -167,7 +167,13 @@ namespace FPJ0000
// var orgQuery = this.ta.Adapter.SelectCommand.CommandText;
string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd,model,serial FROM Projects";
string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev]," +
" [process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],"+
" [costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],"+
" [memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div]," +
" dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd,model,serial,"+
" [championid], dbo.getProjectFinishRate(gcode, idx) AS finishrate" +
" FROM Projects";
//string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects";
string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and ";
@@ -284,8 +290,8 @@ namespace FPJ0000
try
{
this.tam.UpdateAll(this.dsMSSQL);
dsMSSQL.AcceptChanges();
this.ta.Update(this.dsMSSQL.Projects);//.UpdateAll(this.dsMSSQL.Projects);
dsMSSQL.Projects.AcceptChanges();
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
}
catch (Exception ex)