This commit is contained in:
chi
2025-01-02 12:48:16 +09:00
parent e12f310ca2
commit c810348fa6
24 changed files with 4359 additions and 563 deletions

View File

@@ -167,7 +167,7 @@ namespace FCOMMON
public int Total_Request { get; set; }
public int Total_Ipko { get; set; }
public int Total_Remain { get; set; }
}
public static buyinfo GetPartBuyInfo(int project, string sid = null)
@@ -857,6 +857,7 @@ namespace FCOMMON
public string code;
public string title;
public string svalue;
public string svalue2;
public string grp;
}
public static sCodeData getCodeBySvalue(string GroupCode, string svalue)
@@ -865,11 +866,12 @@ namespace FCOMMON
retval.code = string.Empty;
retval.title = string.Empty;
retval.svalue = string.Empty;
retval.svalue2 = string.Empty;
retval.grp = string.Empty;
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo,'')" +
var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')"+
" from Common" +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and svalue = '{1}'";
@@ -880,13 +882,14 @@ namespace FCOMMON
{
retval.code = da[0].ToString();
retval.title = da[1].ToString();
retval.svalue = da[2].ToString();
retval.svalue2 = da[3].ToString();
}
cmd.Dispose();
cn.Close();
cn.Dispose();
retval.grp = GroupCode;
retval.svalue = svalue;
return retval;
}
public static sCodeData getCodeByMemo(string GroupCode, string memo)
@@ -895,12 +898,13 @@ namespace FCOMMON
retval.code = string.Empty;
retval.title = string.Empty;
retval.svalue = string.Empty;
retval.svalue2 = string.Empty;
retval.grp = string.Empty;
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo,'')" +
var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')" +
" from Common" +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and memo = '{1}'";
@@ -911,13 +915,15 @@ namespace FCOMMON
{
retval.code = da[0].ToString();
retval.title = da[1].ToString();
retval.svalue = da[2].ToString();
retval.svalue2 = da[3].ToString();
}
cmd.Dispose();
cn.Close();
cn.Dispose();
retval.grp = GroupCode;
retval.svalue = memo;
//retval.svalue = memo;
return retval;
}
@@ -953,30 +959,30 @@ namespace FCOMMON
}
public static Boolean insertCommonCode(string GroupCode, string code, string memo, string svalue = "")
{
//public static Boolean insertCommonCode(string GroupCode, string code, string memo, string svalue = "",string svalue)
//{
var cn = getCn();
cn.Open();
var sql = "insert into common(gcode,grp,code,svalue,memo,wuid,wdate)" +
" values(@gcode,@grp,@code,@svalue,@memo,@wuid,@wdate)";
// var cn = getCn();
// cn.Open();
// var sql = "insert into common(gcode,grp,code,svalue,memo,wuid,wdate)" +
// " values(@gcode,@grp,@code,@svalue,@memo,@wuid,@wdate)";
sql = string.Format(sql, GroupCode, memo);
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("memo", memo));
cmd.Parameters.Add(new SqlParameter("svalue", svalue));
cmd.Parameters.Add(new SqlParameter("wuid", FCOMMON.info.Login.no));
cmd.Parameters.Add(new SqlParameter("wdate", DateTime.Now));
var da = cmd.ExecuteNonQuery();
// sql = string.Format(sql, GroupCode, memo);
// 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("memo", memo));
// cmd.Parameters.Add(new SqlParameter("svalue", svalue));
// 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();
return da > 0;
}
// cmd.Dispose();
// cn.Close();
// cn.Dispose();
// return da > 0;
//}
public static sCodeData getCodeByCode(string GroupCode, string code)
{
@@ -984,11 +990,12 @@ namespace FCOMMON
retval.code = string.Empty;
retval.title = string.Empty;
retval.svalue = string.Empty;
retval.svalue2 = string.Empty;
retval.grp = string.Empty;
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo,'')" +
var sql = "select isnull(code,''),isnull(memo,''),isnull(svalue,''),isnull(svalue2,'')" +
" from Common" +
" where gcode='" + FCOMMON.info.Login.gcode + "' and Grp = '{0}' and code = '{1}'";
@@ -999,13 +1006,15 @@ namespace FCOMMON
{
retval.code = da[0].ToString();
retval.title = da[1].ToString();
retval.svalue = da[2].ToString();
retval.svalue2 = da[3].ToString();
}
cmd.Dispose();
cn.Close();
cn.Dispose();
retval.grp = GroupCode;
retval.svalue = code;
//retval.svalue = code;
return retval;
}
@@ -1164,12 +1173,13 @@ namespace FCOMMON
System.Data.DataTable retval = new System.Data.DataTable();
retval.Columns.Add("Code", typeof(string));
retval.Columns.Add("Value", typeof(string));
retval.Columns.Add("SValue",typeof(string));
retval.Columns.Add("SValue", typeof(string));
retval.Columns.Add("FValue", typeof(float));
retval.Columns.Add("SValue2", typeof(string));
var cn = getCn();
cn.Open();
var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,''),isnull(fvalue,0)" +
var sql = "select isnull(code,''),isnull(memo ,''),isnull(svalue,''),isnull(fvalue,0),isnull(svalue2,'')" +
" from common" +
" where gcode='" + FCOMMON.info.Login.gcode + "' and grp = '" + GroupCode + "'" +
" and isnull(code,'') <> ''" +
@@ -1189,7 +1199,7 @@ namespace FCOMMON
var rdr = cmd.ExecuteReader();
while (rdr.Read())
{
retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString(), rdr[2].ToString(), rdr[3].ToString() });
retval.Rows.Add(new string[] { rdr[0].ToString(), rdr[1].ToString(), rdr[2].ToString(), rdr[3].ToString(), rdr[4].ToString() });
}
rdr.Close();
cmd.Dispose();