This commit is contained in:
chi
2023-10-19 00:49:41 +09:00
parent 06b0699bf7
commit 2f66e3cca1
37 changed files with 14907 additions and 834 deletions

View File

@@ -45,7 +45,7 @@ namespace FEQ0000
try
{
var search_mananger = tbman.Text.Trim();
var search_admin = tbadm.Text.Trim();
var search_admin = "";// tbadm.Text.Trim();
if (search_mananger.isEmpty() ) search_mananger = "%";
if (search_admin.isEmpty() ) search_admin = "%";
@@ -83,7 +83,17 @@ namespace FEQ0000
{
if (dr.IspumamtNull() == false) sum += dr.pumamt;
}
this.lbSum.Text = $"{sum:N0}";
this.lbSum1.Text = $"{sum:N0}";
}
void UpdateSum2()
{
decimal sum = 0;
var drs = this.dsPurchase1.Ipkolist.Select(this.bs2.Filter);
foreach (dsPurchase.IpkolistRow dr in drs)
{
if (dr.IspumamtNull() == false) sum += dr.pumamt;
}
this.lbSum2.Text = $"{sum:N0}";
}
private void btFind_Click(object sender, EventArgs e)
@@ -102,7 +112,7 @@ namespace FEQ0000
{
try
{
var list = new string[] { "sid","request", "pumname", "bigo","place", "purchase_manager", "purchase_admin" };
var list = new string[] { "sid","request", "pumname", "bigo","place", "purchase_manager" };
var filter = string.Join(" like '%{0}%' or ", list);
filter += " like '%{0}%'";
filter = string.Format(filter, search);
@@ -183,17 +193,17 @@ namespace FEQ0000
var lat_adm = tauser.GetByAdmin(FCOMMON.info.Login.gcode);
tbman.Items.Clear();
tbadm.Items.Clear();
//tbadm.Items.Clear();
foreach(dsPurchase.Purchase_ManagerlistRow dr in lst_man)
{
tbman.Items.Add(dr.username);
}
foreach (dsPurchase.Purchase_ManagerlistRow dr in lat_adm)
{
tbadm.Items.Add(dr.username);
}
//foreach (dsPurchase.Purchase_ManagerlistRow dr in lat_adm)
//{
// tbadm.Items.Add(dr.username);
//}
}
@@ -246,7 +256,7 @@ namespace FEQ0000
private void toolStripButton4_Click(object sender, EventArgs e)
{
func_ipgo();
}
void func_ipgo()
{
@@ -333,7 +343,7 @@ namespace FEQ0000
try
{
var search_mananger = tbman.Text.Trim();
var search_admin = tbadm.Text.Trim(); ;
var search_admin = "";// tbadm.Text.Trim(); ;
if (search_mananger.isEmpty() ) search_mananger = "%";
if (search_admin.isEmpty() ) search_admin = "%";
@@ -348,6 +358,7 @@ namespace FEQ0000
{
FCOMMON.Util.MsgE(ex.Message);
}
UpdateSum2();
}
private void toolStripButton13_Click(object sender, EventArgs e)
@@ -582,10 +593,9 @@ namespace FEQ0000
tbman.Text = string.Empty;
}
private void toolStripLabel7_Click(object sender, EventArgs e)
private void button2_Click(object sender, EventArgs e)
{
if (tbadm.Text.isEmpty() == false)
tbadm.Text = string.Empty;
func_ipgo();
}
}
}