Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

재고 등록화면 프로젝트 입력칸 비활성화 => 완료

Browse Source 
재고 관리 화면 - 보관소 필터링 기능 추가
재고 관리 등록 화면 규격의 값이 없어도 등록 가능 => 완료
보관소 직접입력이 아닌 선택 하게 => 재고등록화면 수정,
품목정보에 공급처 선택 기능 => 공급처 칸(제일 우측) 추가
주문도 보관소 별로 처리 => 완료
안전용 주문등록화면 추가 => 보관소 기능 추가
구매 신청 목록에 "보관소" 열 추가
This commit is contained in:
chikyun.kim
2019-10-01 15:51:12 +09:00
parent 3acf9659e7
commit 80d00fd4b6
78 changed files with 13867 additions and 5520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
SubProject/FEQ0000/Purchase/fPurchase.cs
View File

@@ -13,7 +13,7 @@ namespace FEQ0000
public partial class fPurchase : FCOMMON.fBase
{
string fn_fpcolsize = "";
public fPurchase()
{
InitializeComponent();
@@ -28,7 +28,7 @@ namespace FEQ0000
void dtSD_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode != Keys.Enter) return;
var tb = sender as ToolStripTextBox;
var tb = sender as ToolStripTextBox;
var input = tb.Text.Trim();
if (input == "") tb.Text = DateTime.Now.ToShortDateString();
else
@@ -46,7 +46,7 @@ namespace FEQ0000
tb.Text = dt;
}
}
if(tb == dtSD)
if (tb == dtSD)
{
dtED.Focus();
dtED.SelectAll();
@@ -114,21 +114,21 @@ namespace FEQ0000
col.Locked = true;
}
if(curLevel < 5)
if (curLevel < 5)
{
집계표ToolStripMenuItem.Visible = false;
}
refreshData();
//열표시여부를 설정
var adv= FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv);
if(adv == false)
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)
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;
if (hidecols.Contains(col.DataField.ToLower())) col.Visible = false;
}
}
}
@@ -136,7 +136,7 @@ namespace FEQ0000
private void refreshData()
{
try
{
string state = "%";
@@ -155,22 +155,22 @@ namespace FEQ0000
System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand();
cmd.CommandText = " select *,dbo.getusername(request) as requestName,dbo.getusername(receive) as receiveName" +
" from purchase " +
" where gcode='"+ FCOMMON.info.Login.gcode + "' and isnull(" + dateField + ",'') between @sd and @ed ";
" where gcode='" + FCOMMON.info.Login.gcode + "' and isnull(" + dateField + ",'') between @sd and @ed ";
if (btViewDel.Checked == false)
cmd.CommandText += " and isnull(isdel,0) = 0";
if(tbRequest.Text.Trim() != "")
if (tbRequest.Text.Trim() != "")
{
cmd.CommandText += " and (isnull(dbo.getusername(request),'') like @req or isnull(dbo.getusername(receive),'') like @req)";
}
if (cmbState.SelectedIndex != 0)
{
if(cmbState.Text.ToUpper() == "<=RECEIVED")
if (cmbState.Text.ToUpper() == "<=RECEIVED")
{
cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
}
@@ -179,7 +179,7 @@ namespace FEQ0000
cmd.CommandText += " and isnull([state],'') like @st";
}
}
// else cmd.CommandText += " and (state < '04' or state > '07')";
// else cmd.CommandText += " and (state < '04' or state > '07')";
cmd.CommandText += " ORDER BY " + dateField + " DESC, idx DESC";
cmd.Parameters.Add(new System.Data.SqlClient.SqlParameter("@sd", dtSD.Text));
@@ -209,7 +209,7 @@ namespace FEQ0000
this.fpSpread1.SuspendLayout();
var delindex = this.fpSpread1.ActiveSheet.Columns["isdel"].Index;
var statindex = this.fpSpread1.ActiveSheet.Columns["state"].Index;
for(int i = 0; i< this.fpSpread1.ActiveSheet.Rows.Count;i++)
for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++)
{
var state = this.fpSpread1.ActiveSheet.GetValue(i, statindex);
string stateStr = string.Empty;
@@ -246,26 +246,27 @@ namespace FEQ0000
this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black;
break;
}
}
}
this.fpSpread1.ResumeLayout();
}
private void saveData(Boolean prompt )
private void saveData(Boolean prompt)
{
this.Validate();
this.bs.EndEdit();
try
{
var cnt = this.tam.UpdateAll(this.dsPurchase);
if(prompt) FCOMMON.Util.MsgI(string.Format("{0}건의 자료가 저장 되었습니다.",cnt));
}catch (Exception ex)
var cnt = this.tam.UpdateAll(this.dsPurchase);
if (prompt) FCOMMON.Util.MsgI(string.Format("{0}건의 자료가 저장 되었습니다.", cnt));
}
catch (Exception ex)
{
FCOMMON.Util.MsgE("저장 실패\n" + ex.Message);
}
}
void showSummary()
@@ -274,7 +275,7 @@ namespace FEQ0000
var list = this.dsPurchase.Purchase.Select(this.bs.Filter, "") as dsPurchase.PurchaseRow[];
sum = list.Sum(t => t.pumamt);
//foreach (dsPurchase.PurchaseRow dr in this.dsPurchase.Purchase.Rows)
//if (!dr.IspumamtNull()) sum += dr.pumamt;
//if (!dr.IspumamtNull()) sum += dr.pumamt;
lbSum.Text = sum.ToString("N0");
}
@@ -315,7 +316,7 @@ namespace FEQ0000
private void toolStripLabel3_Click(object sender, EventArgs e)
{
//사용자목록처리
if(tbRequest.Text.Trim() == "")
if (tbRequest.Text.Trim() == "")
{
tbRequest.Text = FCOMMON.info.Login.nameK;
}
@@ -323,11 +324,20 @@ namespace FEQ0000
{
tbRequest.Text = string.Empty;
}
refreshData();
}
private bool getAdminInput
{
get
{
return FCOMMON.Util.getBit(
FCOMMON.info.Login.gpermission,
(int)FCOMMON.eGroupPermission.purchase_adv);
}
}
private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e)
{
func_delete();
@@ -342,8 +352,23 @@ namespace FEQ0000
newdr.request = FCOMMON.info.Login.no;
repeat:
fPurchase_Add f = new fPurchase_Add(newdr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
bool repeat = false;
DialogResult dlg;
if (getAdminInput == false)
{
repeat = false;
var f = new fPurchase_AddS(newdr);
dlg = f.ShowDialog();
}
else
{
var f = new fPurchase_Add(newdr);
dlg = f.ShowDialog();
repeat = f.repeatAdd;
}
if (dlg == System.Windows.Forms.DialogResult.OK)
{
//존재하지 않는 sid 는 추가를 해준다.
var newidx = AddItemInfoGetIndex(newdr);
@@ -352,17 +377,18 @@ namespace FEQ0000
newdr.pumidx = newidx;
newdr.EndEdit();
}
this.dsPurchase.Purchase.AddPurchaseRow(newdr);
int cnt = this.ta.Update(newdr);
if(cnt == 1)
if (cnt == 1)
{
if (f.repeatAdd)
if (repeat)
{
FCOMMON.Util.MsgI("저장 완료\n\n연속 저장 모드이므로 직전에 입력된 자료가 자동으로 설정 됩니다.");
} else FCOMMON.Util.MsgI("저장 완료");
}
else FCOMMON.Util.MsgI("저장 완료");
}
else
{
@@ -371,7 +397,7 @@ namespace FEQ0000
newdr.AcceptChanges();
if (f.repeatAdd)
if (repeat)
{
var newdro = this.dsPurchase.Purchase.NewPurchaseRow();
FCOMMON.Util.CopyData(newdr, newdro);
@@ -383,13 +409,16 @@ namespace FEQ0000
else refreshData(); //181210
}
else newdr.Delete();
}
void func_delete()
{
var drv = bs.Current as DataRowView;
if (drv == null) return;
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth( FCOMMON.DBM.eAuthType.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 != "")
{
@@ -400,7 +429,7 @@ namespace FEQ0000
}
}
if(dr.request != FCOMMON.info.Login.no)
if (dr.request != FCOMMON.info.Login.no)
{
if (curLevel < 5)
{
@@ -414,7 +443,7 @@ namespace FEQ0000
var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?");
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
}
bs.RemoveCurrent();
//일반사용자는 데이터를 바로 삭제한다.
@@ -458,7 +487,7 @@ namespace FEQ0000
private void copyDataToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void btFind_Click(object sender, EventArgs e)
@@ -468,7 +497,7 @@ namespace FEQ0000
if (tbFind.Text != search) tbFind.Text = search;
try
{
if(search.isEmpty())
if (search.isEmpty())
{
this.bs.Filter = "";
tbFind.BackColor = Color.White;
@@ -479,7 +508,7 @@ namespace FEQ0000
string filter = "supply like ? or sid like ? or process like ? or orderno like ? or sc like ? or pumname like ? or pumscale like ? or project like ?";
filter = filter.Replace("?", "'%" + search + "%'");
this.bs.Filter = filter;
tbFind.BackColor = Color.Lime;
tbFind.BackColor = Color.Lime;
}
tbFind.SelectAll();
tbFind.Focus();
@@ -505,40 +534,40 @@ namespace FEQ0000
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPurchase.PurchaseRow;
var newdr = drv.Row as dsPurchase.PurchaseRow;
var f = new fPurchase_Add(dr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
bool repeat = false;
DialogResult dlg;
if (getAdminInput == false)
{
repeat = false;
var f = new fPurchase_AddS(newdr);
dlg = f.ShowDialog();
}
else
{
var f = new fPurchase_Add(newdr);
dlg = f.ShowDialog();
repeat = f.repeatAdd;
}
if (dlg == System.Windows.Forms.DialogResult.OK)
{
//존재하지 않는 sid 는 추가를 해준다.
var newidx = AddItemInfoGetIndex(dr);
var newidx = AddItemInfoGetIndex(newdr);
if (newidx != -1)
{
dr.pumidx = newidx;
dr.EndEdit();
newdr.pumidx = newidx;
newdr.EndEdit();
}
if(dr.RowState != DataRowState.Unchanged)
if (newdr.RowState != DataRowState.Unchanged)
{
this.ta.Update(dr);
dr.AcceptChanges();
this.ta.Update(newdr);
newdr.AcceptChanges();
}
}
else dr.RejectChanges();
}
else newdr.RejectChanges();
private void clearColumnsSizeToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void saveColumnSizeToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void loadColumnSizeToolStripMenuItem_Click(object sender, EventArgs e)
{
}
private void autoToolStripMenuItem_Click(object sender, EventArgs e)
@@ -619,7 +648,7 @@ namespace FEQ0000
private void updateSCToolStripMenuItem_Click(object sender, EventArgs e)
{
var dlg = FCOMMON.Util.MsgQ("#SC가 없는 자료에 한하여 일괄 기록을 실행 합니다.");
if(dlg == System.Windows.Forms.DialogResult.Yes)
if (dlg == System.Windows.Forms.DialogResult.Yes)
{
}
@@ -639,7 +668,7 @@ namespace FEQ0000
| FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName);
}
}
private void 내가등록한자료ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -674,12 +703,12 @@ namespace FEQ0000
refreshData();
}
private void copyToolStripMenuItem_Click(object sender, EventArgs e)
{
//선택된 줄의 데이터를 생성하낟.
var drv = this.bs.Current as DataRowView;
if(drv==null) return;
if (drv == null) return;
var dr = drv.Row as dsPurchase.PurchaseRow;
string buffer = string.Format("{0}_{1}_{2}_{3}_{4}", dr.pumname.Replace("_", "-"), dr.pumscale.Replace("_", "-"), dr.dept.Replace("_", "-"), dr.manuproc.Replace("_", "-"), dr.asset.Replace("_", "-"));
Clipboard.SetText(buffer);
@@ -709,8 +738,22 @@ namespace FEQ0000
newdr.EndEdit();
repeat:
fPurchase_Add f = new fPurchase_Add(newdr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
bool repeat = false;
DialogResult dlg;
if (getAdminInput == false)
{
var f = new fPurchase_AddS(newdr);
dlg = f.ShowDialog();
}
else
{
var f = new fPurchase_Add(newdr);
dlg = f.ShowDialog();
repeat = f.repeatAdd;
}
if (dlg == System.Windows.Forms.DialogResult.OK)
{
//존재하지 않는 sid 는 추가를 해준다.
var newidx = AddItemInfoGetIndex(newdr);
@@ -724,7 +767,7 @@ namespace FEQ0000
this.ta.Update(newdr);
newdr.AcceptChanges();
if (f.repeatAdd)
if (repeat)
{
var newdro = this.dsPurchase.Purchase.NewPurchaseRow();
FCOMMON.Util.CopyData(newdr, newdro);
@@ -737,8 +780,8 @@ namespace FEQ0000
}
else newdr.Delete();
}
private void toolStripButton1_Click_2(object sender, EventArgs e)
{
func_copy();