공정 항목 추가 (업무일지, 프로젝트)
구매내역에 s/c 정렬 기능 추가
This commit is contained in:
@@ -116,7 +116,7 @@ namespace FCOMMON
|
||||
cmd.ExecuteNonQuery();
|
||||
retval = true;
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch
|
||||
{
|
||||
|
||||
}
|
||||
@@ -269,14 +269,14 @@ namespace FCOMMON
|
||||
/// <returns></returns>
|
||||
public static Boolean addProjectHistory(int ProjectIdx, string pdate, string Message)
|
||||
{
|
||||
|
||||
|
||||
var cn = getCn();
|
||||
cn.Open();
|
||||
|
||||
string sql =
|
||||
"insert into ProjectsHistory(pidx,pdate,remark,wuid,wdate)" +
|
||||
string sql =
|
||||
"insert into ProjectsHistory(pidx,pdate,remark,wuid,wdate)" +
|
||||
" values(@pidx,@pdate,@remark,@wuid,@wdate)";
|
||||
|
||||
|
||||
var cmd = new SqlCommand(sql, cn);
|
||||
cmd.Parameters.Add(new SqlParameter("pidx", ProjectIdx));
|
||||
cmd.Parameters.Add(new SqlParameter("pdate", pdate));
|
||||
@@ -519,7 +519,7 @@ namespace FCOMMON
|
||||
retval.svalue = string.Empty;
|
||||
retval.grp = string.Empty;
|
||||
|
||||
|
||||
|
||||
var cn = getCn();
|
||||
cn.Open();
|
||||
var sql = "select isnull(code,''),isnull(memo,'')" +
|
||||
@@ -543,11 +543,11 @@ namespace FCOMMON
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static Boolean insertCommonCode(string GroupCode, string code,string memo,string svalue="")
|
||||
|
||||
public static Boolean insertCommonCode(string GroupCode, string code, string memo, string svalue = "")
|
||||
{
|
||||
|
||||
|
||||
var cn = getCn();
|
||||
cn.Open();
|
||||
var sql = "insert into common(gcode,grp,code,svalue,memo,wuid,wdate)" +
|
||||
@@ -557,13 +557,13 @@ namespace FCOMMON
|
||||
var cmd = new SqlCommand(sql, cn);
|
||||
cmd.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode));
|
||||
cmd.Parameters.Add(new SqlParameter("grp", GroupCode));
|
||||
cmd.Parameters.Add(new SqlParameter("code", code));
|
||||
cmd.Parameters.Add(new SqlParameter("code", code));
|
||||
cmd.Parameters.Add(new SqlParameter("memo", memo));
|
||||
cmd.Parameters.Add(new SqlParameter("svalue", svalue));
|
||||
cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no));
|
||||
cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no));
|
||||
cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now));
|
||||
var da = cmd.ExecuteNonQuery();
|
||||
|
||||
|
||||
cmd.Dispose();
|
||||
cn.Close();
|
||||
cn.Dispose();
|
||||
@@ -577,7 +577,7 @@ namespace FCOMMON
|
||||
retval.title = string.Empty;
|
||||
retval.svalue = string.Empty;
|
||||
retval.grp = string.Empty;
|
||||
|
||||
|
||||
var cn = getCn();
|
||||
cn.Open();
|
||||
var sql = "select isnull(code,''),isnull(memo,'')" +
|
||||
@@ -652,6 +652,38 @@ namespace FCOMMON
|
||||
else return null;
|
||||
}
|
||||
|
||||
public static System.Data.DataTable getProcessList()
|
||||
{
|
||||
|
||||
System.Data.DataTable retval = new System.Data.DataTable();
|
||||
retval.Columns.Add("Code");
|
||||
retval.Columns.Add("Value");
|
||||
|
||||
var cn = getCn();
|
||||
cn.Open();
|
||||
var sql = "select isnull(processs,'') as process" +
|
||||
" from Users" +
|
||||
" where processs is not null and gcode='{0}'" +
|
||||
" group by processs" +
|
||||
" order by process";
|
||||
|
||||
sql = string.Format(sql, FCOMMON.info.Login.gcode);
|
||||
var cmd = new SqlCommand(sql, cn);
|
||||
var rdr = cmd.ExecuteReader();
|
||||
var cnt = 0;
|
||||
while (rdr.Read())
|
||||
{
|
||||
retval.Rows.Add(new string[] { cnt.ToString(), rdr[0].ToString() });
|
||||
cnt += 1;
|
||||
}
|
||||
rdr.Close();
|
||||
cmd.Dispose();
|
||||
cn.Close();
|
||||
cn.Dispose();
|
||||
return retval;
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static System.Data.DataTable getUserProjectList(string userName)
|
||||
{
|
||||
@@ -662,7 +694,7 @@ namespace FCOMMON
|
||||
|
||||
var cn = getCn();
|
||||
cn.Open();
|
||||
var sql = "select idx,isnull(name,''),pdate from Projects" +
|
||||
var sql = "select idx,isnull(name,''),pdate from Projects" +
|
||||
" where gcode='{0}'" +
|
||||
" and isnull(userManager,'') like '%{1}%'" +
|
||||
" or isnull(userMain,'') like '%{1}%'" +
|
||||
@@ -740,7 +772,7 @@ namespace FCOMMON
|
||||
cn.Open();
|
||||
var sql = "select isnull(place,'')" +
|
||||
" from Inventory " +
|
||||
" where gcode = '{0}'" +
|
||||
" where gcode = '{0}'" +
|
||||
" order by place";
|
||||
sql = string.Format(sql, gcode);
|
||||
var cmd = new SqlCommand(sql, cn);
|
||||
@@ -832,7 +864,7 @@ namespace FCOMMON
|
||||
cn.Close();
|
||||
cn.Dispose();
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch
|
||||
{
|
||||
work = 0;
|
||||
total = 0;
|
||||
@@ -855,7 +887,7 @@ namespace FCOMMON
|
||||
var cmd2 = new SqlCommand("", cn);
|
||||
|
||||
cmd2.CommandText = string.Format("select count(*) from Items " +
|
||||
" where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ","").Replace("'", "''") + model.Replace(" ","").Replace("'", "''"));
|
||||
" where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Replace(" ", "").Replace("'", "''") + model.Replace(" ", "").Replace("'", "''"));
|
||||
var cnt = int.Parse(cmd2.ExecuteScalar().ToString());
|
||||
if (cnt == 0)
|
||||
{
|
||||
@@ -896,14 +928,16 @@ namespace FCOMMON
|
||||
//}
|
||||
//else retval = -1;
|
||||
}
|
||||
|
||||
|
||||
//{
|
||||
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("'", "''"));
|
||||
var itemdata = cmd2.ExecuteScalar();
|
||||
if(itemdata == DBNull.Value || itemdata == null)
|
||||
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("'", "''"));
|
||||
var itemdata = cmd2.ExecuteScalar();
|
||||
if (itemdata == DBNull.Value || itemdata == null)
|
||||
{
|
||||
retval = -1;
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
var strItem = itemdata.ToString();
|
||||
if (strItem == "") retval = -1;
|
||||
else retval = int.Parse(strItem);
|
||||
|
||||
Reference in New Issue
Block a user