Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

업무일지 프로세스 선택화면 크기 변경 및 목록에서 비활성계정의 데이터 나오지 않게 함

Browse Source
This commit is contained in:
chi
2025-01-07 09:34:17 +09:00
parent d406494ce4
commit d6655018f6
20 changed files with 140 additions and 676 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
SubProject/FCOMMON/DataBaseManager.cs
View File

@@ -40,7 +40,7 @@ namespace FCOMMON
cn.Open();
List<string> retval = new List<string>();
var sql = "SELECT place FROM Inventory WHERE(gcode = @gcode) AND(ISNULL(place, '') <> '') GROUP BY place ORDER BY place";
var sql = "SELECT place FROM Inventory WITH (nolock) WHERE(gcode = @gcode) AND(ISNULL(place, '') <> '') GROUP BY place ORDER BY place";
var cmd = new SqlCommand(sql, cn);
cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode;
try
@@ -61,6 +61,43 @@ namespace FCOMMON
return retval;
}
/// <summary>
/// EETGW_GroupUser 테이블에서 활성화된 사용자의 process 목록을 가져온다
/// </summary>
/// <returns></returns>
public static List<string> GroupUserProcessList()
{
var cn = getCn();
cn.Open();
List<string> retval = new List<string>();
var sql = "SELECT Process FROM EETGW_GroupUser WITH (nolock) WHERE (ISNULL(Process, '') <> '') AND (gcode = @gcode) and useJobReport = 1 and useUserState =1 GROUP BY Process ORDER BY Process";
var cmd = new SqlCommand(sql, cn);
cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode;
try
{
var rdr = cmd.ExecuteReader();
while (rdr.Read())
{
retval.Add(rdr[0].ToString());
}
}
catch
{
}
cn.Close();
cn.Dispose();
return retval;
}
public static byte[] getImagByteArray(System.Drawing.Image img)
{
if (img == null || img.Width < 1 || img.Height < 1) return null;
@@ -242,7 +279,7 @@ namespace FCOMMON
{
var sql =
" select isnull(((sum((case when isnull(pumqty,0) = isnull(inqty,0) then 1 else 0 end))*1.0) / count(*))*100,0)" +
" from EETGW_PurchaseCR" +
" from EETGW_PurchaseCR WITH (nolock) " +
" where gcode = @gcode" +
" and projectidx = @project" +
" and isnull(isdel,0) = 0" +
@@ -322,7 +359,7 @@ namespace FCOMMON
{
try
{
var sql = "select max(prgmVersion) from ProgramUser" +
var sql = "select max(prgmVersion) from ProgramUser WITH (nolock) " +
" where prgmName = 'Amkor K4-EET GroupWare'";
return ExecuteScalar(sql);
}
@@ -342,7 +379,7 @@ namespace FCOMMON
cn.Open();
var retval = new List<string>();
string sql = "select count(*) from EETGW_Magam where gcode=@gcode and pdate = @pdate";
string sql = "select count(*) from EETGW_Magam WITH (nolock) where gcode=@gcode and pdate = @pdate";
var cmd = new SqlCommand(sql, cn);
cmd.Parameters.Add("gcode", System.Data.SqlDbType.VarChar).Value = gcode;
cmd.Parameters.Add("pdate", System.Data.SqlDbType.VarChar).Value = mon;
@@ -393,7 +430,7 @@ namespace FCOMMON
var retval = new List<string>();
string sql = "select pdate" +
" from EETGW_Magam " +
" from EETGW_Magam WITH (nolock) " +
" where gcode=@gcode and pdate between @sdate and @edate and isnull(pdate,'') <> ''";
var cmd = new SqlCommand(sql, cn);
@@ -436,7 +473,7 @@ namespace FCOMMON
var retval = new List<string>();
string sql = "select count(*)" +
" from EETGW_Magam " +
" from EETGW_Magam WITH (nolock) " +
" where gcode=@gcode and pdate = @sdate";
var cmd = new SqlCommand(sql, cn);
@@ -465,7 +502,7 @@ namespace FCOMMON
int maxidx = int.Parse(cmd.ExecuteScalar().ToString());
if (maxidx == -1) return retval;
cmd.CommandText = "select * from Purchase where idx = " + maxidx.ToString();
cmd.CommandText = "select * from Purchase WITH (nolock) where idx = " + maxidx.ToString();
var rdr = cmd.ExecuteReader();
while (rdr.Read())
{
@@ -501,12 +538,12 @@ namespace FCOMMON
var retval = new sItemInfo();
retval.idx = -1;
string sql = "select isnull(max(idx),-1) from EETGW_PurchaseCR where pumidx = " + idx.ToString();
string sql = "select isnull(max(idx),-1) from EETGW_PurchaseCR WITH (nolock) where pumidx = " + idx.ToString();
var cmd = new SqlCommand(sql, cn);
int maxidx = int.Parse(cmd.ExecuteScalar().ToString());
if (maxidx == -1) return retval;
cmd.CommandText = "select * from EETGW_PurchaseCR where idx = " + maxidx.ToString();
cmd.CommandText = "select * from EETGW_PurchaseCR WITH (nolock) where idx = " + maxidx.ToString();
var rdr = cmd.ExecuteReader();
while (rdr.Read())
{
@@ -551,7 +588,7 @@ namespace FCOMMON
" round(isnull(sum(drtime),0),2)," +
" round(isnull(sum(crtime),0),2)," +
" round(isnull(sum(drtime)-sum(crtime),0),2) as JanTime" +
" from Holyday " +
" from Holyday WITH (nolock) " +
" where gcode=@gcode and uid = @uid and sdate between @sdate and @edate group by cate order by cate";
var cmd = new SqlCommand(sql, cn);
@@ -592,7 +629,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
string sql = "select idx,name,name2 from Customs where (name like '%SEEMAX%' or name2 like '%{0}%')";
string sql = "select idx,name,name2 from Customs WITH (nolock) where (name like '%SEEMAX%' or name2 like '%{0}%')";
sql = string.Format(sql, nameLike);
var cmd = new SqlCommand(sql, cn);
var rdr = cmd.ExecuteReader();
@@ -650,7 +687,7 @@ namespace FCOMMON
var retval = new sItemInfo();
retval.idx = -1;
string sql = "select * from Items where gcode='" + FCOMMON.info.Login.gcode + "' and idx = " + idx.ToString();
string sql = "select * from Items WITH (nolock) where gcode='" + FCOMMON.info.Login.gcode + "' and idx = " + idx.ToString();
var cmd = new SqlCommand(sql, cn);
var rdr = cmd.ExecuteReader();
while (rdr.Read())
@@ -700,7 +737,7 @@ namespace FCOMMON
var iCnt = cmd.ExecuteNonQuery();
if (iCnt == 1)
{
cmd.CommandText = "select isnull(idx,-1) from Items where gcode=@gcode and [sid] = @sid";
cmd.CommandText = "select isnull(idx,-1) from Items WITH (nolock) where gcode=@gcode and [sid] = @sid";
cmd.Parameters.Clear();
cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode));
cmd.Parameters.Add(new SqlParameter("sid", info.sid));
@@ -719,7 +756,7 @@ namespace FCOMMON
var retval = new sItemInfo();
retval.idx = -1;
string sql = "select * from Items where [gcode] = '" + FCOMMON.info.Login.gcode + "' and [sid] = '" + sid + "'";
string sql = "select * from Items WITH (nolock) where [gcode] = '" + FCOMMON.info.Login.gcode + "' and [sid] = '" + sid + "'";
var cmd = new SqlCommand(sql, cn);
var rdr = cmd.ExecuteReader();
while (rdr.Read())
@@ -824,7 +861,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(SValue,'')" +
" from Common" +
" from Common WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'";
sql = string.Format(sql, GroupCode, code);
@@ -840,7 +877,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(FValue,0)" +
" from Common" +
" from Common WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'";
sql = string.Format(sql, GroupCode, code);
@@ -872,7 +909,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')"+
" from Common" +
" from Common WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and svalue = '{1}'";
sql = string.Format(sql, GroupCode, svalue);
@@ -905,7 +942,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')" +
" from Common" +
" from Common WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and memo = '{1}'";
sql = string.Format(sql, GroupCode, memo);
@@ -996,7 +1033,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')" +
" from Common" +
" from Common WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'";
sql = string.Format(sql, GroupCode, code);
@@ -1027,7 +1064,7 @@ namespace FCOMMON
{
var cn = getCn();
cn.Open();
var sql = "select top 1 * from JobReport" +
var sql = "select top 1 * from JobReport WITH (nolock) " +
" where gcode ='" + FCOMMON.info.Login.gcode + "' and isnull(pidx,-1)=" + projectIdx.ToString() +
" and uid ='" + uid + "'" +
" order by pdate desc, idx desc";
@@ -1042,7 +1079,7 @@ namespace FCOMMON
{
var cn = getCn();
cn.Open();
var sql = "select top 1 * from JobReport" +
var sql = "select top 1 * from JobReport WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(projectName,'') like '" + prjName + "'" +
" and uid ='" + uid + "'" +
" order by pdate desc, idx desc";
@@ -1057,7 +1094,7 @@ namespace FCOMMON
{
var cn = getCn();
cn.Open();
var sql = "select top 1 * from JobReport" +
var sql = "select top 1 * from JobReport WITH (nolock) " +
" where gcode = '" + FCOMMON.info.Login.gcode + "' and isnull([type],'')='" + type + "'" +
" and uid ='" + uid + "'" +
" order by pdate desc, idx desc";
@@ -1079,7 +1116,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(processs,'') as process" +
" from Users" +
" from Users WITH (nolock) " +
" where processs is not null and gcode='{0}'" +
" group by processs" +
" order by process";
@@ -1140,7 +1177,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select idx, '[' + cast(idx as varchar) + '] ' + isnull(name,''),isnull(name,'') from Projects" +
var sql = "select idx, '[' + cast(idx as varchar) + '] ' + isnull(name,''),isnull(name,'') from Projects WITH (nolock) " +
" where gcode='{0}'" +
" and (isnull(userManager,'') like '%{1}%'" +
" or isnull(userMain,'') like '%{1}%'" +
@@ -1180,7 +1217,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,''),isnull(fvalue,0),isnull(svalue2,'')" +
" from common" +
" from common WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" +
" and isnull(code,'') <> ''" +
" order by ";
@@ -1213,7 +1250,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull({1},''),isnull({2},'')" +
" from {0} " +
" from {0} WITH (nolock) " +
" where gcode = '" + FCOMMON.info.Login.gcode + "' ";
if (where != "") sql += " and " + where;
if (order != "") sql += " order by " + order;
@@ -1236,7 +1273,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull(place,'')" +
" from Inventory " +
" from Inventory WITH (nolock) " +
" where gcode = '{0}' and isnull(place,'') <> ''" +
" group by place order by place";
sql = string.Format(sql, gcode);
@@ -1272,7 +1309,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select {0} " +
" from {1} " +
" from {1} WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' ";
if (where != "") sql += " and " + where;
@@ -1313,7 +1350,7 @@ namespace FCOMMON
cn.Open();
var sql = "select isnull(sum(hrs),0) as hrs,isnull(sum(ot),0) as ot,dbo.getWorkDayCount('{1}') as workday" +
" from JobReport" +
" from JobReport WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and uid = '{0}' and substring(pdate,1,7) = '{1}'";
sql = string.Format(sql, uid, yymm);
@@ -1356,7 +1393,7 @@ namespace FCOMMON
int retval = -1;
var cmd2 = new SqlCommand("", cn);
cmd2.CommandText = string.Format("select count(*) from Items " +
cmd2.CommandText = string.Format("select count(*) from Items WITH (nolock) " +
" where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ", "").Replace("'", "''"));
var cnt = int.Parse(cmd2.ExecuteScalar().ToString());
if (cnt == 0)
@@ -1400,7 +1437,7 @@ namespace FCOMMON
}
//{
cmd2.CommandText = string.Format("select min(idx) from Items where gcode='" + FCOMMON.info.Login.gcode + "' and ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ", "").Replace("'", "''"));
cmd2.CommandText = string.Format("select min(idx) from Items WITH (nolock) where gcode='" + FCOMMON.info.Login.gcode + "' and ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ", "").Replace("'", "''"));
var itemdata = cmd2.ExecuteScalar();
if (itemdata == DBNull.Value || itemdata == null)
{
@@ -1428,7 +1465,7 @@ namespace FCOMMON
int retval = 0;
var cmd2 = new SqlCommand("", cn);
cmd2.CommandText = string.Format("update Items set sid=@sid where idx=@idx");
cmd2.CommandText = string.Format("update Items WITH (nolock) set sid=@sid where idx=@idx");
cmd2.Parameters.Clear();
cmd2.Parameters.Add(new SqlParameter("idx", itemIdx));
@@ -1445,12 +1482,12 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select {0} " +
" from {1} " +
" from {1} WITH (nolock) " +
" where isnull({0},'') != '' ";
if (table.ToUpper() == "USERS")
sql = "select {0} " +
" from {1} " +
" from {1} WITH (nolock) " +
" where isnull({0},'') != '' ";
@@ -1481,12 +1518,12 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select {0} " +
" from {1} " +
" from {1} WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' ";
if (table.ToUpper() == "USERS")
sql = "select {0} " +
" from {1} " +
" from {1} WITH (nolock) " +
" where isnull({0},'') != '' ";
@@ -1517,7 +1554,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select max(isnull(path_kj,'')) " +
" from UserGroup " +
" from UserGroup WITH (nolock) " +
" where dept = '" + dept + "'";
sql = string.Format(sql);
@@ -1569,7 +1606,7 @@ namespace FCOMMON
" isnull(pumprice,0) as pumprice, " +
" isnull(supply,'') as supply, " +
" isnull(supplyidx,-1) as supplyidx" +
" from purchase " +
" from purchase WITH (nolock) " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(sid,'') <> '' and " +
" isnull(sid,'') <> '신규'" +
" and isnull(pumidx,-1) = -1 " +

4
SubProject/FCOMMON/fBase.cs
View File

@@ -56,8 +56,8 @@ namespace FCOMMON
{
CenterToScreen();
}
var minW = Math.Max(320, this.MinimumSize.Width);
var minH = Math.Max(240, this.MinimumSize.Height);
var minW = Math.Max(480, this.MinimumSize.Width);
var minH = Math.Max(640, this.MinimumSize.Height);
if (Width < minW || Height < minH)
{

9
SubProject/FPJ0000/JobReport_/K5Dailyform.cs
View File

@@ -6,6 +6,7 @@ using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Net.Configuration;
using System.Text;
using System.Windows.Forms;
@@ -28,10 +29,10 @@ namespace FPJ0000.JobReport_
this.tbProcess.Items.Clear();
tbProcess.Items.Add("--전체--");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
//사용자의 공정명을 선택해준다
this.tbProcess.Text = FCOMMON.info.Login.process;

8
SubProject/FPJ0000/JobReport_/fJobChartMenu.cs
View File

@@ -33,10 +33,10 @@ namespace FPJ0000.JobReport_
this.tbProcess.Items.Clear();
tbProcess.Items.Add("--전체--");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
//사용자의 공정명을 선택해준다
this.tbProcess.Text = FCOMMON.info.Login.process;

4
SubProject/FPJ0000/JobReport_/fJobReport.cs
View File

@@ -97,8 +97,8 @@ namespace FPJ0000
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
//var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
//var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
//cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
//foreach (dsReport.ProcessListRow dr in dtProcList)

8
SubProject/FPJ0000/JobReport_/fJobReportAI.cs
View File

@@ -33,13 +33,13 @@ namespace FPJ0000
EnsureVisibleAndUsableSize();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
//var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = FCOMMON.DBM.GroupUserProcessList();//taProc.GetData(FCOMMON.info.Login.gcode);
cmbProcess.Items.Clear();
cmbProcess.Items.Add("--전체--");
foreach (dsReport.ProcessListRow dr in dtProcList)
foreach (var dr in dtProcList)
{
cmbProcess.Items.Add(dr.processs);
cmbProcess.Items.Add(dr);
}
cmbProcess.Text = FCOMMON.info.Login.process;
if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함

10
SubProject/FPJ0000/JobReport_/fSelectProcess.Designer.cs generated
View File

@@ -45,15 +45,15 @@ namespace FPJ0000.JobReport_
this.cmbProcess.FormattingEnabled = true;
this.cmbProcess.Location = new System.Drawing.Point(0, 25);
this.cmbProcess.Name = "cmbProcess";
this.cmbProcess.Size = new System.Drawing.Size(289, 328);
this.cmbProcess.Size = new System.Drawing.Size(465, 576);
this.cmbProcess.TabIndex = 0;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.button1.Location = new System.Drawing.Point(0, 353);
this.button1.Location = new System.Drawing.Point(0, 601);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(289, 39);
this.button1.Size = new System.Drawing.Size(465, 39);
this.button1.TabIndex = 2;
this.button1.Text = "확인";
this.button1.UseVisualStyleBackColor = true;
@@ -67,7 +67,7 @@ namespace FPJ0000.JobReport_
this.toolStripButton3});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(289, 25);
this.toolStrip1.Size = new System.Drawing.Size(465, 25);
this.toolStrip1.TabIndex = 1;
this.toolStrip1.Text = "toolStrip1";
//
@@ -102,7 +102,7 @@ namespace FPJ0000.JobReport_
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(289, 392);
this.ClientSize = new System.Drawing.Size(465, 640);
this.Controls.Add(this.cmbProcess);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.button1);

16
SubProject/FPJ0000/JobReport_/fSelectProcess.cs
View File

@@ -24,15 +24,17 @@ namespace FPJ0000.JobReport_
{
EnsureVisibleAndUsableSize();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
var prclist = FCOMMON.DBM.GroupUserProcessList();
//var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
//var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
foreach (dsReport.ProcessListRow dr in dtProcList)
foreach (var dr in prclist)
{
cmbProcess.Items.Add(dr.processs);
if (values.Contains(dr.processs))
cmbProcess.Items.Add(dr);
if (values.Contains(dr))
{
this.cmbProcess.SetItemChecked(cmbProcess.Items.Count - 1, true);
}
@@ -50,8 +52,8 @@ namespace FPJ0000.JobReport_
{
values.Add(cmbProcess.Items[i].ToString());
}
}
if(values.Count < 1)
}
if (values.Count < 1)
{
FCOMMON.Util.MsgE("공정선택이 필요 합니다");
return;

8
SubProject/FPJ0000/JobReport_/rJobReport.cs
View File

@@ -23,10 +23,10 @@ namespace FPJ0000.JobReport_
EnsureVisibleAndUsableSize();
this.tbProcess.Items.Clear();
tbProcess.Items.Add("전체");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;

8
SubProject/FPJ0000/JobReport_/rJobReportDay.cs
View File

@@ -27,10 +27,10 @@ namespace FPJ0000.JobReport_
EnsureVisibleAndUsableSize();
this.tbProcess.Items.Clear();
tbProcess.Items.Add("전체");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;

8
SubProject/FPJ0000/JobReport_/rJobReportOT.cs
View File

@@ -23,10 +23,10 @@ namespace FPJ0000.JobReport_
EnsureVisibleAndUsableSize();
this.tbProcess.Items.Clear();
tbProcess.Items.Add("전체");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();//taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
//this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;

8
SubProject/FPJ0000/JobReport_/rJobReportPrj.cs
View File

@@ -27,10 +27,10 @@ namespace FPJ0000.JobReport_
EnsureVisibleAndUsableSize();
this.tbProcess.Items.Clear();
tbProcess.Items.Add("--전체--");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;

8
SubProject/FPJ0000/JobReport_/rJobReportPrjSche.cs
View File

@@ -34,10 +34,10 @@ namespace FPJ0000.JobReport_
this.tbProcess.Items.Clear();
tbProcess.Items.Add("--전체--");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
// var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
//this.tbProcess.Text = FCOMMON.info.Login.process;
tbProcess.SelectedIndex = 0;

8
SubProject/FPJ0000/JobReport_/rJobReportType.cs
View File

@@ -28,10 +28,10 @@ namespace FPJ0000.JobReport_
EnsureVisibleAndUsableSize();
this.tbProcess.Items.Clear();
tbProcess.Items.Add("--전체--");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();//taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;

8
SubProject/FPJ0000/JobReport_/rJobReportUser.cs
View File

@@ -31,10 +31,10 @@ namespace FPJ0000.JobReport_
this.tbProcess.Items.Clear();
tbProcess.Items.Add("--전체--");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
//var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = FCOMMON.DBM.GroupUserProcessList();// taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (var dr in dtProcessList)
tbProcess.Items.Add(dr);
//사용자의 공정명을 선택해준다
this.tbProcess.Text = FCOMMON.info.Login.process;

8
SubProject/FPJ0000/OtConfirm/fOTConfirm.cs
View File

@@ -41,8 +41,8 @@ namespace FPJ0000
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
// var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = FCOMMON.DBM.GroupUserProcessList();//taProc.GetData(FCOMMON.info.Login.gcode);
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.otconfirm));
//cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
@@ -50,9 +50,9 @@ namespace FPJ0000
List<String> fprclist = new List<string>();
foreach (dsReport.ProcessListRow dr in dtProcList)
foreach (var dr in dtProcList)
{
fprclist.Add(dr.processs);
fprclist.Add(dr);
}
tbProcess.Tag = fprclist.ToArray();
tbProcess.Text = string.Join(",", fprclist.ToArray());

536
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -28,8 +28,6 @@ namespace FPJ0000 {
private JobReportDayDataTable tableJobReportDay;
private ProcessListDataTable tableProcessList;
private ProcessUserListDataTable tableProcessUserList;
private HolidayLIstDataTable tableHolidayLIst;
@@ -78,9 +76,6 @@ namespace FPJ0000 {
if ((ds.Tables["JobReportDay"] != null)) {
base.Tables.Add(new JobReportDayDataTable(ds.Tables["JobReportDay"]));
}
if ((ds.Tables["ProcessList"] != null)) {
base.Tables.Add(new ProcessListDataTable(ds.Tables["ProcessList"]));
}
if ((ds.Tables["ProcessUserList"] != null)) {
base.Tables.Add(new ProcessUserListDataTable(ds.Tables["ProcessUserList"]));
}
@@ -140,16 +135,6 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
[global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)]
public ProcessListDataTable ProcessList {
get {
return this.tableProcessList;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -293,9 +278,6 @@ namespace FPJ0000 {
if ((ds.Tables["JobReportDay"] != null)) {
base.Tables.Add(new JobReportDayDataTable(ds.Tables["JobReportDay"]));
}
if ((ds.Tables["ProcessList"] != null)) {
base.Tables.Add(new ProcessListDataTable(ds.Tables["ProcessList"]));
}
if ((ds.Tables["ProcessUserList"] != null)) {
base.Tables.Add(new ProcessUserListDataTable(ds.Tables["ProcessUserList"]));
}
@@ -362,12 +344,6 @@ namespace FPJ0000 {
this.tableJobReportDay.InitVars();
}
}
this.tableProcessList = ((ProcessListDataTable)(base.Tables["ProcessList"]));
if ((initTable == true)) {
if ((this.tableProcessList != null)) {
this.tableProcessList.InitVars();
}
}
this.tableProcessUserList = ((ProcessUserListDataTable)(base.Tables["ProcessUserList"]));
if ((initTable == true)) {
if ((this.tableProcessUserList != null)) {
@@ -424,8 +400,6 @@ namespace FPJ0000 {
base.Tables.Add(this.tablejobReport);
this.tableJobReportDay = new JobReportDayDataTable();
base.Tables.Add(this.tableJobReportDay);
this.tableProcessList = new ProcessListDataTable();
base.Tables.Add(this.tableProcessList);
this.tableProcessUserList = new ProcessUserListDataTable();
base.Tables.Add(this.tableProcessUserList);
this.tableHolidayLIst = new HolidayLIstDataTable();
@@ -454,12 +428,6 @@ namespace FPJ0000 {
return false;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private bool ShouldSerializeProcessList() {
return false;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private bool ShouldSerializeProcessUserList() {
@@ -563,9 +531,6 @@ namespace FPJ0000 {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public delegate void JobReportDayRowChangeEventHandler(object sender, JobReportDayRowChangeEvent e);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public delegate void ProcessListRowChangeEventHandler(object sender, ProcessListRowChangeEvent e);
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public delegate void ProcessUserListRowChangeEventHandler(object sender, ProcessUserListRowChangeEvent e);
@@ -1333,265 +1298,6 @@ namespace FPJ0000 {
}
}
/// <summary>
///Represents the strongly named DataTable class.
///</summary>
[global::System.Serializable()]
[global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")]
public partial class ProcessListDataTable : global::System.Data.TypedTableBase<ProcessListRow> {
private global::System.Data.DataColumn columnprocesss;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProcessListDataTable() {
this.TableName = "ProcessList";
this.BeginInit();
this.InitClass();
this.EndInit();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal ProcessListDataTable(global::System.Data.DataTable table) {
this.TableName = table.TableName;
if ((table.CaseSensitive != table.DataSet.CaseSensitive)) {
this.CaseSensitive = table.CaseSensitive;
}
if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) {
this.Locale = table.Locale;
}
if ((table.Namespace != table.DataSet.Namespace)) {
this.Namespace = table.Namespace;
}
this.Prefix = table.Prefix;
this.MinimumCapacity = table.MinimumCapacity;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected ProcessListDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) :
base(info, context) {
this.InitVars();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn processsColumn {
get {
return this.columnprocesss;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
public int Count {
get {
return this.Rows.Count;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProcessListRow this[int index] {
get {
return ((ProcessListRow)(this.Rows[index]));
}
}
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public event ProcessListRowChangeEventHandler ProcessListRowChanging;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public event ProcessListRowChangeEventHandler ProcessListRowChanged;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public event ProcessListRowChangeEventHandler ProcessListRowDeleting;
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public event ProcessListRowChangeEventHandler ProcessListRowDeleted;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void AddProcessListRow(ProcessListRow row) {
this.Rows.Add(row);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProcessListRow AddProcessListRow(string processs) {
ProcessListRow rowProcessListRow = ((ProcessListRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
processs};
rowProcessListRow.ItemArray = columnValuesArray;
this.Rows.Add(rowProcessListRow);
return rowProcessListRow;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProcessListRow FindByprocesss(string processs) {
return ((ProcessListRow)(this.Rows.Find(new object[] {
processs})));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public override global::System.Data.DataTable Clone() {
ProcessListDataTable cln = ((ProcessListDataTable)(base.Clone()));
cln.InitVars();
return cln;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected override global::System.Data.DataTable CreateInstance() {
return new ProcessListDataTable();
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal void InitVars() {
this.columnprocesss = base.Columns["processs"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitClass() {
this.columnprocesss = new global::System.Data.DataColumn("processs", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnprocesss);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnprocesss}, true));
this.columnprocesss.AllowDBNull = false;
this.columnprocesss.Unique = true;
this.columnprocesss.MaxLength = 100;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProcessListRow NewProcessListRow() {
return ((ProcessListRow)(this.NewRow()));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) {
return new ProcessListRow(builder);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected override global::System.Type GetRowType() {
return typeof(ProcessListRow);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowChanged(e);
if ((this.ProcessListRowChanged != null)) {
this.ProcessListRowChanged(this, new ProcessListRowChangeEvent(((ProcessListRow)(e.Row)), e.Action));
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowChanging(e);
if ((this.ProcessListRowChanging != null)) {
this.ProcessListRowChanging(this, new ProcessListRowChangeEvent(((ProcessListRow)(e.Row)), e.Action));
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowDeleted(e);
if ((this.ProcessListRowDeleted != null)) {
this.ProcessListRowDeleted(this, new ProcessListRowChangeEvent(((ProcessListRow)(e.Row)), e.Action));
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) {
base.OnRowDeleting(e);
if ((this.ProcessListRowDeleting != null)) {
this.ProcessListRowDeleting(this, new ProcessListRowChangeEvent(((ProcessListRow)(e.Row)), e.Action));
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void RemoveProcessListRow(ProcessListRow row) {
this.Rows.Remove(row);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) {
global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType();
global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence();
dsReport ds = new dsReport();
global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny();
any1.Namespace = "http://www.w3.org/2001/XMLSchema";
any1.MinOccurs = new decimal(0);
any1.MaxOccurs = decimal.MaxValue;
any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
sequence.Items.Add(any1);
global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny();
any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1";
any2.MinOccurs = new decimal(1);
any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax;
sequence.Items.Add(any2);
global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute();
attribute1.Name = "namespace";
attribute1.FixedValue = ds.Namespace;
type.Attributes.Add(attribute1);
global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute();
attribute2.Name = "tableTypeName";
attribute2.FixedValue = "ProcessListDataTable";
type.Attributes.Add(attribute2);
type.Particle = sequence;
global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable();
if (xs.Contains(dsSchema.TargetNamespace)) {
global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream();
global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream();
try {
global::System.Xml.Schema.XmlSchema schema = null;
dsSchema.Write(s1);
for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) {
schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current));
s2.SetLength(0);
schema.Write(s2);
if ((s1.Length == s2.Length)) {
s1.Position = 0;
s2.Position = 0;
for (; ((s1.Position != s1.Length)
&& (s1.ReadByte() == s2.ReadByte())); ) {
;
}
if ((s1.Position == s1.Length)) {
return type;
}
}
}
}
finally {
if ((s1 != null)) {
s1.Close();
}
if ((s2 != null)) {
s2.Close();
}
}
}
xs.Add(dsSchema);
return type;
}
}
/// <summary>
///Represents the strongly named DataTable class.
///</summary>
@@ -4859,32 +4565,6 @@ namespace FPJ0000 {
}
}
/// <summary>
///Represents strongly named DataRow class.
///</summary>
public partial class ProcessListRow : global::System.Data.DataRow {
private ProcessListDataTable tableProcessList;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal ProcessListRow(global::System.Data.DataRowBuilder rb) :
base(rb) {
this.tableProcessList = ((ProcessListDataTable)(this.Table));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string processs {
get {
return ((string)(this[this.tableProcessList.processsColumn]));
}
set {
this[this.tableProcessList.processsColumn] = value;
}
}
}
/// <summary>
///Represents strongly named DataRow class.
///</summary>
@@ -6864,40 +6544,6 @@ namespace FPJ0000 {
}
}
/// <summary>
///Row event argument class
///</summary>
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public class ProcessListRowChangeEvent : global::System.EventArgs {
private ProcessListRow eventRow;
private global::System.Data.DataRowAction eventAction;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProcessListRowChangeEvent(ProcessListRow row, global::System.Data.DataRowAction action) {
this.eventRow = row;
this.eventAction = action;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProcessListRow Row {
get {
return this.eventRow;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataRowAction Action {
get {
return this.eventAction;
}
}
}
/// <summary>
///Row event argument class
///</summary>
@@ -7660,188 +7306,6 @@ ORDER BY processs, JobReport.pdate, uname";
}
}
/// <summary>
///Represents the connection and commands used to retrieve and save data.
///</summary>
[global::System.ComponentModel.DesignerCategoryAttribute("code")]
[global::System.ComponentModel.ToolboxItem(true)]
[global::System.ComponentModel.DataObjectAttribute(true)]
[global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" +
", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public partial class ProcessListTableAdapter : global::System.ComponentModel.Component {
private global::System.Data.SqlClient.SqlDataAdapter _adapter;
private global::System.Data.SqlClient.SqlConnection _connection;
private global::System.Data.SqlClient.SqlTransaction _transaction;
private global::System.Data.SqlClient.SqlCommand[] _commandCollection;
private bool _clearBeforeFill;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ProcessListTableAdapter() {
this.ClearBeforeFill = true;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter {
get {
if ((this._adapter == null)) {
this.InitAdapter();
}
return this._adapter;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlConnection Connection {
get {
if ((this._connection == null)) {
this.InitConnection();
}
return this._connection;
}
set {
this._connection = value;
if ((this.Adapter.InsertCommand != null)) {
this.Adapter.InsertCommand.Connection = value;
}
if ((this.Adapter.DeleteCommand != null)) {
this.Adapter.DeleteCommand.Connection = value;
}
if ((this.Adapter.UpdateCommand != null)) {
this.Adapter.UpdateCommand.Connection = value;
}
for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
if ((this.CommandCollection[i] != null)) {
((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value;
}
}
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
internal global::System.Data.SqlClient.SqlTransaction Transaction {
get {
return this._transaction;
}
set {
this._transaction = value;
for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) {
this.CommandCollection[i].Transaction = this._transaction;
}
if (((this.Adapter != null)
&& (this.Adapter.DeleteCommand != null))) {
this.Adapter.DeleteCommand.Transaction = this._transaction;
}
if (((this.Adapter != null)
&& (this.Adapter.InsertCommand != null))) {
this.Adapter.InsertCommand.Transaction = this._transaction;
}
if (((this.Adapter != null)
&& (this.Adapter.UpdateCommand != null))) {
this.Adapter.UpdateCommand.Transaction = this._transaction;
}
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
protected global::System.Data.SqlClient.SqlCommand[] CommandCollection {
get {
if ((this._commandCollection == null)) {
this.InitCommandCollection();
}
return this._commandCollection;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool ClearBeforeFill {
get {
return this._clearBeforeFill;
}
set {
this._clearBeforeFill = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitAdapter() {
this._adapter = new global::System.Data.SqlClient.SqlDataAdapter();
global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping();
tableMapping.SourceTable = "Table";
tableMapping.DataSetTable = "ProcessList";
tableMapping.ColumnMappings.Add("processs", "processs");
this._adapter.TableMappings.Add(tableMapping);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitConnection() {
this._connection = new global::System.Data.SqlClient.SqlConnection();
this._connection.ConnectionString = global::FPJ0000.Properties.Settings.Default.gwcs;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT Process AS processs\r\nFROM EETGW_GroupUser WITH (nolock)\r\nWHERE (ISNU" +
"LL(Process, N\'\') <> \'\') AND (gcode = @gcode)\r\nGROUP BY Process\r\nORDER BY process" +
"s";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
public virtual int Fill(dsReport.ProcessListDataTable dataTable, string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
int returnValue = this.Adapter.Fill(dataTable);
return returnValue;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
public virtual dsReport.ProcessListDataTable GetData(string gcode) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
else {
this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode));
}
dsReport.ProcessListDataTable dataTable = new dsReport.ProcessListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
}
/// <summary>
///Represents the connection and commands used to retrieve and save data.
///</summary>

39
SubProject/FPJ0000/dsReport.xsd
View File

@@ -90,28 +90,6 @@ ORDER BY processs, JobReport.pdate, uname</CommandText>
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ProcessListTableAdapter" GeneratorDataComponentClassName="ProcessListTableAdapter" Name="ProcessList" UserDataComponentName="ProcessListTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.EETGW_GroupUser" DbObjectType="Table" 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 Process AS processs
FROM EETGW_GroupUser WITH (nolock)
WHERE (ISNULL(Process, N'') &lt;&gt; '') AND (gcode = @gcode)
GROUP BY Process
ORDER BY processs</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.EETGW_GroupUser" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
</DbSource>
</MainSource>
<Mappings>
<Mapping SourceColumn="processs" DataSetColumn="processs" />
</Mappings>
<Sources />
</TableAdapter>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="ProcessUserListTableAdapter" GeneratorDataComponentClassName="ProcessUserListTableAdapter" Name="ProcessUserList" UserDataComponentName="ProcessUserListTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" 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">
@@ -516,19 +494,6 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessList" msprop:Generator_RowEvHandlerName="ProcessListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessListRowDeleted" msprop:Generator_RowDeletingName="ProcessListRowDeleting" msprop:Generator_RowEvArgName="ProcessListRowChangeEvent" msprop:Generator_TablePropName="ProcessList" msprop:Generator_RowChangedName="ProcessListRowChanged" msprop:Generator_UserTableName="ProcessList" msprop:Generator_RowChangingName="ProcessListRowChanging" msprop:Generator_RowClassName="ProcessListRow" msprop:Generator_TableClassName="ProcessListDataTable" msprop:Generator_TableVarName="tableProcessList">
<xs:complexType>
<xs:sequence>
<xs:element name="processs" msprop:Generator_ColumnPropNameInTable="processsColumn" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="processs" msprop:Generator_UserColumnName="processs" msprop:Generator_ColumnVarNameInTable="columnprocesss">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="100" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ProcessUserList" msprop:Generator_RowEvHandlerName="ProcessUserListRowChangeEventHandler" msprop:Generator_RowDeletedName="ProcessUserListRowDeleted" msprop:Generator_RowDeletingName="ProcessUserListRowDeleting" msprop:Generator_RowEvArgName="ProcessUserListRowChangeEvent" msprop:Generator_TablePropName="ProcessUserList" msprop:Generator_RowChangedName="ProcessUserListRowChanged" msprop:Generator_UserTableName="ProcessUserList" msprop:Generator_RowChangingName="ProcessUserListRowChanging" msprop:Generator_RowClassName="ProcessUserListRow" msprop:Generator_TableClassName="ProcessUserListDataTable" msprop:Generator_TableVarName="tableProcessUserList">
<xs:complexType>
<xs:sequence>
@@ -896,10 +861,6 @@ ORDER BY Projects.idx DESC, subidx, EETGW_ProjectsSchedule.no, EETGW_ProjectsSch
<xs:field xpath="mstns:uid" />
<xs:field xpath="mstns:pdate" />
</xs:unique>
<xs:unique name="ProcessList_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
<xs:selector xpath=".//mstns:ProcessList" />
<xs:field xpath="mstns:processs" />
</xs:unique>
<xs:unique name="ProcessUserList_Constraint1" msdata:ConstraintName="Constraint1">
<xs:selector xpath=".//mstns:ProcessUserList" />
<xs:field xpath="mstns:id" />

1
SubProject/FPJ0000/dsReport.xss
View File

@@ -8,7 +8,6 @@
<Shapes>
<Shape ID="DesignTable:jobReport" ZOrder="5" X="384" Y="301" Height="419" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="2" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="10" X="587" Y="64" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="9" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:HolidayLIst" ZOrder="7" X="915" Y="260" Height="191" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vJobReportForUser" ZOrder="1" X="118" Y="436" Height="362" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />