1. 입고화면의 구매담당/승인 필터 추가 및 합계금액 추가
2. 구매목록의 담당/승인자 목록이 공용코드 기반에서 실데이터 기반으로 변경되었습니다.
This commit is contained in:
@@ -11,6 +11,7 @@ using System.Windows.Forms;
|
||||
using NetOffice;
|
||||
using Outlook = NetOffice.OutlookApi;
|
||||
using NetOffice.OutlookApi.Enums;
|
||||
using System.Security.Cryptography.X509Certificates;
|
||||
|
||||
namespace FEQ0000
|
||||
{
|
||||
@@ -43,8 +44,17 @@ namespace FEQ0000
|
||||
{
|
||||
try
|
||||
{
|
||||
var search_mananger = tbman.Text.Trim();
|
||||
var search_admin = tbadm.Text.Trim();
|
||||
if (search_mananger.isEmpty() ) search_mananger = "%";
|
||||
if (search_admin.isEmpty() ) search_admin = "%";
|
||||
|
||||
var dt = DateTime.Now.AddYears(-2);
|
||||
this.ta.Fill(this.dsPurchase.Ipkolist, dt.ToShortDateString(), FCOMMON.info.Login.gcode);
|
||||
this.ta.Fill(this.dsPurchase.Ipkolist,
|
||||
dt.ToShortDateString(),
|
||||
FCOMMON.info.Login.gcode,
|
||||
search_mananger, search_admin);
|
||||
|
||||
ipkolistDataGridView.AutoResizeColumn(0);
|
||||
ipkolistDataGridView.AutoResizeColumn(1);
|
||||
ipkolistDataGridView.AutoResizeColumn(2);
|
||||
@@ -62,7 +72,18 @@ namespace FEQ0000
|
||||
{
|
||||
System.Windows.Forms.MessageBox.Show(ex.Message);
|
||||
}
|
||||
UpdateSum();
|
||||
}
|
||||
|
||||
void UpdateSum()
|
||||
{
|
||||
decimal sum = 0;
|
||||
var drs = this.dsPurchase.Ipkolist.Select(this.bs.Filter);
|
||||
foreach(dsPurchase.IpkolistRow dr in drs)
|
||||
{
|
||||
if (dr.IspumamtNull() == false) sum += dr.pumamt;
|
||||
}
|
||||
this.lbSum.Text = $"{sum:N0}";
|
||||
}
|
||||
|
||||
private void btFind_Click(object sender, EventArgs e)
|
||||
@@ -108,7 +129,7 @@ namespace FEQ0000
|
||||
|
||||
tbFind.Focus();
|
||||
tbFind.SelectAll();
|
||||
|
||||
UpdateSum();
|
||||
}
|
||||
void findText2()
|
||||
{
|
||||
@@ -155,6 +176,27 @@ namespace FEQ0000
|
||||
|
||||
private void fItemin_Load(object sender, EventArgs e)
|
||||
{
|
||||
//구매담당자목록
|
||||
using (var tauser = new dsPurchaseTableAdapters.Purchase_ManagerlistTableAdapter())
|
||||
{
|
||||
var lst_man = tauser.GetByManager(FCOMMON.info.Login.gcode);
|
||||
var lat_adm = tauser.GetByAdmin(FCOMMON.info.Login.gcode);
|
||||
|
||||
tbman.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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
tbindate.Text = DateTime.Now.ToShortDateString();
|
||||
refreshData();
|
||||
}
|
||||
@@ -290,7 +332,16 @@ namespace FEQ0000
|
||||
{
|
||||
try
|
||||
{
|
||||
this.ta.FillByTodayIn(this.dsPurchase1.Ipkolist, tbindate.Text, FCOMMON.info.Login.gcode);
|
||||
var search_mananger = tbman.Text.Trim();
|
||||
var search_admin = tbadm.Text.Trim(); ;
|
||||
if (search_mananger.isEmpty() ) search_mananger = "%";
|
||||
if (search_admin.isEmpty() ) search_admin = "%";
|
||||
|
||||
this.ta.FillByTodayIn(this.dsPurchase1.Ipkolist, tbindate.Text,
|
||||
FCOMMON.info.Login.gcode,
|
||||
search_mananger,
|
||||
search_admin);
|
||||
|
||||
dv2.AutoResizeColumns();
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -524,5 +575,17 @@ namespace FEQ0000
|
||||
"아웃룩의 설정이 정상인지 확인하세요");
|
||||
}
|
||||
}
|
||||
|
||||
private void toolStripLabel6_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (tbman.Text.isEmpty() == false)
|
||||
tbman.Text = string.Empty;
|
||||
}
|
||||
|
||||
private void toolStripLabel7_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (tbadm.Text.isEmpty() == false)
|
||||
tbadm.Text = string.Empty;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user