공정 항목 추가 (업무일지, 프로젝트)
구매내역에 s/c 정렬 기능 추가
This commit is contained in:
@@ -13,24 +13,35 @@ namespace FBS0000
|
||||
{
|
||||
Boolean bInit = false;
|
||||
dsMSSQL.HolydayRow dr;
|
||||
public fHolyday_Add(dsMSSQL.HolydayRow dr_)
|
||||
|
||||
public fHolyday_Add(int idx)
|
||||
{
|
||||
InitializeComponent();
|
||||
dr = dr_;
|
||||
this.cmbCate.DataSource = FCOMMON.DBM.getCodeTable("02"); ;
|
||||
this.cmbCate.DisplayMember = "KeyValue";
|
||||
this.cmbCate.ValueMember = "Key";
|
||||
|
||||
this.cmbRlt.DataSource = FCOMMON.DBM.getCodeTable("03"); ;
|
||||
this.cmbRlt.DisplayMember = "KeyValue";
|
||||
this.cmbRlt.ValueMember = "Key";
|
||||
if(idx == -1)
|
||||
{
|
||||
dr = this.dsMSSQL.Holyday.NewHolydayRow();
|
||||
dr.sdate = DateTime.Parse( DateTime.Now.Year.ToString() + "-01-01");
|
||||
dr.edate = dr.sdate;
|
||||
dr.wuid = FCOMMON.info.Login.no;
|
||||
dr.wdate = DateTime.Now;
|
||||
dr.term = 0.0;
|
||||
dr.cate = "10";
|
||||
dr.gcode = FCOMMON.info.Login.gcode;
|
||||
dr.uid = FCOMMON.info.Login.no;
|
||||
this.dsMSSQL.Holyday.AddHolydayRow(dr);
|
||||
}
|
||||
else
|
||||
{
|
||||
ta.FillByIdx(this.dsMSSQL.Holyday, FCOMMON.info.Login.gcode, idx);
|
||||
this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow;
|
||||
}
|
||||
|
||||
this.cmbUser.DataSource = FCOMMON.DBM.getUserTable(); ;
|
||||
this.cmbUser.DisplayMember = "KeyValue";
|
||||
this.cmbUser.ValueMember = "Key";
|
||||
|
||||
this.cmbUser.DisplayMember = "dispName";
|
||||
this.cmbUser.ValueMember = "id";
|
||||
this.bs.DataSource = dr;
|
||||
}
|
||||
public fHolyday_Add() : this(-1) { }
|
||||
|
||||
|
||||
private void __Load(object sender, EventArgs e)
|
||||
@@ -40,32 +51,47 @@ namespace FBS0000
|
||||
|
||||
private void btOK_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.Invalidate();
|
||||
//기본값처리
|
||||
|
||||
|
||||
this.Validate();
|
||||
this.bs.EndEdit();
|
||||
if(dr.cate.CompareTo("20") >= 0)
|
||||
this.dr.EndEdit();
|
||||
|
||||
try
|
||||
{
|
||||
dr.term *= -1;
|
||||
dr.EndEdit();
|
||||
|
||||
this.ta.Update(this.dr);
|
||||
dr.AcceptChanges();
|
||||
DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
}
|
||||
DialogResult = System.Windows.Forms.DialogResult.OK;
|
||||
catch (Exception eX)
|
||||
{
|
||||
FCOMMON.Util.MsgE(eX.Message);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
if (!bInit) return;
|
||||
if(dateTimePicker1.Value > this.dateTimePicker2.Value)
|
||||
this.dateTimePicker2.Value = dateTimePicker1.Value;
|
||||
RefreshTerm();
|
||||
|
||||
|
||||
//if(dateTimePicker1.Value > this.dateTimePicker2.Value)
|
||||
// this.dateTimePicker2.Value = dateTimePicker1.Value;
|
||||
//RefreshTerm();
|
||||
|
||||
|
||||
}
|
||||
|
||||
void RefreshTerm()
|
||||
{
|
||||
var ts = dateTimePicker2.Value - dateTimePicker1.Value;
|
||||
var days = Math.Ceiling(ts.TotalDays) + 1;
|
||||
this.numericUpDown1.Value = (decimal)days;
|
||||
this.dr.term = days;
|
||||
//var ts = dateTimePicker2.Value - dateTimePicker1.Value;
|
||||
//var days = Math.Ceiling(ts.TotalDays) + 1;
|
||||
//this.numericUpDown1.Value = (decimal)days;
|
||||
//this.dr.term = days;
|
||||
}
|
||||
private void dateTimePicker2_ValueChanged(object sender, EventArgs e)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user