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

@@ -96,7 +96,7 @@ namespace FEQ0000
//this.cmbCr.SelectedIndex = 1;
//일반사용자의경우에는 상태를 변경하지 못한다.
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.purchase));
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase));
if (curLevel >= 5)
{
btSave.Visible = true;
@@ -121,6 +121,16 @@ namespace FEQ0000
refreshData();
//열표시여부를 설정
var adv= FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv);
if(adv == false)
{
var hidecols = new string[] { "receivename", "receive","asset", "dept","manuproc","process", "cr", "orderno", "manuproc", "project", "projectidx", "edate", "po" };
foreach(FarPoint.Win.Spread.Column col in fpSpread1_Sheet1.Columns)
{
if (hidecols.Contains(col.DataField.ToLower())) col.Visible = false;
}
}
}
@@ -131,17 +141,21 @@ namespace FEQ0000
{
string state = "%";
if (cmbState.SelectedIndex > 0) state = cmbState.Text.Split(',')[0];
string request = "%";
if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%";
if (tbRequest.Text.Trim() != "")
request = "%" + tbRequest.Text.Trim() + "%";// tbRequest.Text.Substring(1, tbRequest.Text.IndexOf("]") - 1);
string dateField = "pdate";
if (cmDate.SelectedIndex == 1) dateField = "indate";
else if (cmDate.SelectedIndex == 2) dateField = "expdate";
System.Data.SqlClient.SqlDataAdapter da = new System.Data.SqlClient.SqlDataAdapter();
System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand();
cmd.CommandText = " select *" +
cmd.CommandText = " select *,dbo.getusername(request) as requestName,dbo.getusername(receive) as receiveName" +
" from purchase " +
" where isnull(" + dateField + ",'') between @sd and @ed ";
" where gcode='"+ FCOMMON.info.Login.gcode + "' and isnull(" + dateField + ",'') between @sd and @ed ";
@@ -149,7 +163,10 @@ namespace FEQ0000
cmd.CommandText += " and isnull(isdel,0) = 0";
if(tbRequest.Text.Trim() != "")
cmd.CommandText += " and (isnull(request,'') like @req or isnull(receive,'') like @req)";
{
cmd.CommandText += " and (isnull(dbo.getusername(request),'') like @req or isnull(dbo.getusername(receive),'') like @req)";
}
if (cmbState.SelectedIndex != 0)
{
@@ -318,6 +335,12 @@ namespace FEQ0000
void func_add()
{
var newdr = this.dsPurchase.Purchase.NewPurchaseRow();
if (FCOMMON.info.Login.no == "dev")
newdr.request = "395552";//string.Format("[{0}] {1}", "395552", "김치균");
else
newdr.request = FCOMMON.info.Login.no;
repeat:
fPurchase_Add f = new fPurchase_Add(newdr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
@@ -366,7 +389,7 @@ namespace FEQ0000
var drv = bs.Current as DataRowView;
if (drv == null) return;
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth( FCOMMON.DBM.eAutoType.purchase));
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth( FCOMMON.DBM.eAuthType.purchase));
var dr = drv.Row as dsPurchase.PurchaseRow;
if (dr.sc != "")
{
@@ -377,7 +400,7 @@ namespace FEQ0000
}
}
if(dr.request != FCOMMON.info.Login.nameK)
if(dr.request != FCOMMON.info.Login.no)
{
if (curLevel < 5)
{
@@ -750,5 +773,10 @@ namespace FEQ0000
func_add();
}
private void toolStripButton2_Click_1(object sender, EventArgs e)
{
this.Close();
}
}
}