This commit is contained in:
chikyun.kim
2019-07-26 17:28:19 +09:00
parent ae209e00af
commit 11d7c7f704
58 changed files with 3360 additions and 6285 deletions

View File

@@ -374,7 +374,7 @@ namespace FCOMMON
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]";
" where gcode='"+ FCOMMON.info.Login.gcode+"' and [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();
@@ -527,7 +527,8 @@ namespace FCOMMON
var cn = getCn();
cn.Open();
var sql = "select isnull({1},''),isnull({2},'')" +
" from {0} where gcode = '" + FCOMMON.info.Login.gcode + "' ";
" 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);
@@ -642,7 +643,8 @@ namespace FCOMMON
int retval = -1;
var cmd2 = new SqlCommand("", cn);
cmd2.CommandText = "select count(*) from Items where name ='" + pumname + "'";
cmd2.CommandText = string.Format( "select count(*) from Items " +
" where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'",pumname.Trim().Replace("'","''") + model.Trim().Replace("'","''"));
var cnt = int.Parse(cmd2.ExecuteScalar().ToString());
if (cnt == 0)
{
@@ -658,8 +660,6 @@ namespace FCOMMON
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));
@@ -684,13 +684,37 @@ namespace FCOMMON
}
else retval = -1;
}
else
{
cmd2.CommandText = string.Format("select idx from Items where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Trim().Replace("'", "''") + model.Trim().Replace("'", "''"));
retval = int.Parse(cmd2.ExecuteScalar().ToString());
}
cmd2.Dispose();
cn.Close();
cn.Dispose();
return retval;
}
public static Boolean UpdateItemSID(int itemIdx,string sid)
{
var cn = getCn();
cn.Open();
int retval = 0;
var cmd2 = new SqlCommand("", cn);
cmd2.CommandText = string.Format("update Items set sid=@sid where idx=@idx");
cmd2.Parameters.Clear();
cmd2.Parameters.Add(new SqlParameter("idx", itemIdx));
cmd2.Parameters.Add(new SqlParameter("sid", sid));
retval = cmd2.ExecuteNonQuery();
cmd2.Dispose();
cn.Close();
cn.Dispose();
return retval != 0;
}
public static List<String> getGroupList(string GroupColumn, string table, string where = "",Boolean desc=false,Boolean useColumncover=true)
{
List<string> retval = new List<string>();