This commit is contained in:
chikyun.kim
2019-07-25 08:29:57 +09:00
parent 5c77244a45
commit ae209e00af
85 changed files with 21568 additions and 4313 deletions

View File

@@ -268,7 +268,7 @@ namespace FCOMMON
var retval = new sItemInfo();
retval.idx = -1;
string sql = "select * from Items where idx = " + idx.ToString();
string sql = "select * from Items where gcode='" + FCOMMON.info.Login.gcode + "' and idx = " + idx.ToString();
var cmd = new SqlCommand(sql, cn);
var rdr = cmd.ExecuteReader();
while(rdr.Read())
@@ -297,11 +297,12 @@ namespace FCOMMON
cn.Open();
string sql = "insert into Items" +
" ([cate],[sid],[model],[supply],[supplyidx],[name],[unit],[scale],[price],[wuid],[wdate])" +
" ([gcode],[cate],[sid],[model],[supply],[supplyidx],[name],[unit],[scale],[price],[wuid],[wdate])" +
" values " +
" (@cate,@sid,@model,@supply,@supplyidx,@name,@unit,@scale,@price,@wuid,@wdate)";
" (@gcode,@cate,@sid,@model,@supply,@supplyidx,@name,@unit,@scale,@price,@wuid,@wdate)";
var cmd = new SqlCommand(sql, cn);
cmd.Parameters.Add(new SqlParameter("@gcode", FCOMMON.info.Login.gcode));
cmd.Parameters.Add(new SqlParameter("@cate", "etc"));
cmd.Parameters.Add(new SqlParameter("@sid", info.sid));
cmd.Parameters.Add(new SqlParameter("@model", info.model));
@@ -317,8 +318,9 @@ namespace FCOMMON
var iCnt = cmd.ExecuteNonQuery();
if(iCnt == 1)
{
cmd.CommandText = "select isnull(idx,-1) from Items where [sid] = @sid";
cmd.CommandText = "select isnull(idx,-1) from Items 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));
retval = (int)cmd.ExecuteScalar();
}
@@ -335,7 +337,7 @@ namespace FCOMMON
var retval = new sItemInfo();
retval.idx = -1;
string sql = "select * from Items where [sid] = '" + sid + "'";
string sql = "select * from Items where [gcode] = '" + FCOMMON.info.Login.gcode + "' and [sid] = '" + sid + "'";
var cmd = new SqlCommand(sql, cn);
var rdr = cmd.ExecuteReader();
while (rdr.Read())
@@ -370,8 +372,9 @@ namespace FCOMMON
var retval = new sItemInfo();
retval.idx = -1;
string sql = "select [id],[name],concat([name],'(',[id],')') as dispName,[dept],[email],[level],[tel] from Users " +
" where [id] <> 'dev' and dept like '%장비기술%' and dept like '%1파트%' order by [name]";
string sql = "select [id],[name],concat([name],'(',[id],')') as dispName,[dept],[email],[level],[tel] "+
" from Users " +
" where [id] <> 'dev' and dept like '%"+ FCOMMON.info.Login.dept.Replace("'","''") +"%' order by [name]";
var cmd = new SqlCommand(sql, cn);
var da = new SqlDataAdapter(sql, cn);
var ds = new System.Data.DataSet();
@@ -429,7 +432,7 @@ namespace FCOMMON
cn.Open();
var sql = "select isnull(SValue,'')" +
" from Common" +
" where Grp = '{0}' and code = '{1}'";
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'";
sql = string.Format(sql, GroupCode, code);
var cmd = new SqlCommand(sql, cn);
@@ -450,7 +453,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select top 1 * from JobReport" +
" where isnull(pidx,-1)=" + projectIdx.ToString() +
" where gcode ='"+ FCOMMON.info.Login.gcode + "' and isnull(pidx,-1)=" + projectIdx.ToString() +
" and uid ='" + uid + "'" +
" order by pdate desc, idx desc";
var da = new SqlDataAdapter(sql, cn);
@@ -465,7 +468,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select top 1 * from JobReport" +
" where isnull(projectName,'') like '" + prjName + "'" +
" where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(projectName,'') like '" + prjName + "'" +
" and uid ='" + uid + "'" +
" order by pdate desc, idx desc";
var da = new SqlDataAdapter(sql, cn);
@@ -480,7 +483,7 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select top 1 * from JobReport" +
" where isnull([type],'')='" + type + "'" +
" where gcode = '" + FCOMMON.info.Login.gcode + "' and isnull([type],'')='" + type + "'" +
" and uid ='" + uid + "'" +
" order by pdate desc, idx desc";
var da = new SqlDataAdapter(sql, cn);
@@ -503,7 +506,7 @@ namespace FCOMMON
cn.Open();
var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,'')" +
" from common" +
" where grp = '" + GroupCode + "'" +
" where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" +
" and isnull(code,'') <> ''" +
" order by isnull(memo,'')";
var cmd = new SqlCommand(sql, cn);
@@ -524,8 +527,8 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull({1},''),isnull({2},'')" +
" from {0}";
if (where != "") sql += " where " + where;
" from {0} where gcode = '" + FCOMMON.info.Login.gcode + "' ";
if (where != "") sql += " and " + where;
if (order != "") sql += " order by " + order;
sql = string.Format(sql,table, col1, col2);
var cmd = new SqlCommand(sql, cn);
@@ -562,7 +565,7 @@ namespace FCOMMON
cn.Open();
var sql = "select {0} " +
" from {1} " +
" where isnull({0},'') != '' ";
" where gcode='" + FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' ";
if (where != "") sql += " and " + where;
if (order != "") sql += " order by " + order;
@@ -603,7 +606,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" +
" where uid = '{0}' and substring(pdate,1,7) = '{1}'";
" where gcode='" + FCOMMON.info.Login.gcode + "' and uid = '{0}' and substring(pdate,1,7) = '{1}'";
sql = string.Format(sql, uid, yymm);
var cmd = new SqlCommand(sql, cn);
@@ -647,18 +650,19 @@ namespace FCOMMON
if(pic == null)
{
cmd2.CommandText = "insert into items(cate,name,sid,model,scale,unit,supply,supplyidx,price,wuid,wdate)" +
"values(@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@wuid,@wdate)";
cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,wuid,wdate)" +
"values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@wuid,@wdate)";
}
else
{
cmd2.CommandText = "insert into items(cate,name,sid,model,scale,unit,supply,supplyidx,price,image,wuid,wdate)" +
"values(@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@image,@wuid,@wdate)";
cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,image,wuid,wdate)" +
"values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@image,@wuid,@wdate)";
}
cmd2.Parameters.Clear();
cmd2.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode));
cmd2.Parameters.Add(new SqlParameter("cate", "--"));
cmd2.Parameters.Add(new SqlParameter("name", pumname));
cmd2.Parameters.Add(new SqlParameter("sid", sid));
@@ -675,7 +679,7 @@ namespace FCOMMON
if (retval == 0)
{
cmd2.CommandText = "select idx from Items where name = @name and sid = @sid and model = @model and wuid = @wuid and wdate = @wdate";
cmd2.CommandText = "select idx from Items where gcode=@gcode and name = @name and sid = @sid and model = @model and wuid = @wuid and wdate = @wdate";
retval = int.Parse(cmd2.ExecuteScalar().ToString());
}
else retval = -1;
@@ -693,9 +697,15 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select {0} " +
" from {1} " +
" where gcode='" +FCOMMON.info.Login.gcode + "' and isnull({0},'') != '' ";
if(table.ToUpper() == "USERS")
sql = "select {0} " +
" from {1} " +
" where isnull({0},'') != '' ";
if (where != "") sql += " and " + where;
sql += " group by {0} " +
@@ -722,7 +732,7 @@ namespace FCOMMON
{
var cn = getCn();
cn.Open();
var sql = "select isnull(path_kj,'') " +
var sql = "select max(isnull(path_kj,'')) " +
" from UserGroup " +
" where dept = '" + dept + "'";
@@ -776,7 +786,7 @@ namespace FCOMMON
" isnull(supply,'') as supply, " +
" isnull(supplyidx,-1) as supplyidx" +
" from purchase " +
" where isnull(sid,'') <> '' and " +
" where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(sid,'') <> '' and " +
" isnull(sid,'') <> '신규'" +
" and isnull(pumidx,-1) = -1 " +
" and len(sid) = 9" +
@@ -798,20 +808,22 @@ namespace FCOMMON
var idx = int.Parse(rdr["idx"].ToString());
//아이템정보에서 이 sid 가 1개 존재한다면 그것에 연결한다.
var sql2 = "select isnull(idx,-1) from Items where [sid] = '"+sid+"'";
var sql2 = "select isnull(idx,-1) from Items where gcode='" + FCOMMON.info.Login.gcode + "' and [sid] = '"+sid+"'";
cmd2.CommandText = sql2;
var itemdata = cmd2.ExecuteScalar();
if(itemdata != null && itemdata.ToString() != "-1")
{
cmd2.CommandText = "update purchase set pumidx = " + itemdata.ToString() + " where idx=" + idx.ToString();
cmd2.CommandText = "update purchase set pumidx = " + itemdata.ToString() +
" where gcode='" + FCOMMON.info.Login.gcode + "' and idx=" + idx.ToString();
retval += cmd2.ExecuteNonQuery();
}
else
{
cmd2.CommandText = "insert into items(cate,name,sid,model,scale,unit,supply,supplyidx,price,wuid,wdate)" +
"values(@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@wuid,@wdate)";
cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,wuid,wdate)" +
"values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@wuid,@wdate)";
cmd2.Parameters.Clear();
cmd2.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode));
cmd2.Parameters.Add(new SqlParameter("cate", "--"));
cmd2.Parameters.Add(new SqlParameter("name", pumname));
cmd2.Parameters.Add(new SqlParameter("sid", sid));