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

구매복사시 chk1,chk2 초기화 및 EB구매 컬럼의 필터 기능 추가

Browse Source
This commit is contained in:
chi
2024-06-26 13:58:30 +09:00
parent e4f8981491
commit dde60a7fe8
14 changed files with 3719 additions and 1616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SubProject/FCOMMON/Util_Form.cs
View File

@@ -140,7 +140,7 @@ namespace FCOMMON
int t = 0;
if (!int.TryParse(leftStr, out l)) l = 0;
if (!int.TryParse(topStr, out t)) t = 0;
if (l != 0 || t != 0)
if (f.StartPosition != FormStartPosition.CenterScreen && (l != 0 || t != 0))
{
if (l > (maxWidth - 10)) l = 0;
if (t >= (maxHeigh - 10)) t = 0;

9
SubProject/FEQ0000/PurchaseCR/fPurchaseCR.cs
View File

@@ -126,7 +126,7 @@ namespace FEQ0000
cmbState.Items.Add("-- 전체 --");
foreach (var item in stList)
cmbState.Items.Add(item.Value);
cmbState.Items.Add("<=Received");
cmbState.Items.Add("<Received");
this.cmbState.SelectedIndex = 0; //all기본 - 양진원
//this.cmbCr.SelectedIndex = 1;
@@ -223,7 +223,7 @@ namespace FEQ0000
if (cmbState.SelectedIndex != 0)
{
if (cmbState.Text.ToUpper() == "<=RECEIVED")
if (cmbState.Text.ToUpper() == "<RECEIVED")
{
cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
}
@@ -1019,7 +1019,10 @@ namespace FEQ0000
newdr.po = string.Empty;
newdr.indate = string.Empty;
newdr.edate = string.Empty;
newdr.pumqty = 0; //실구매수량은 제거
newdr.chk1 = false;
newdr.chk2 = false;
newdr.SetpumqtyNull();
//newdr.pumqty = 0; //실구매수량은 제거
newdr.idx = -1;
newdr.EndEdit();

3
SubProject/FEQ0000/PurchaseEB/fPurchaseEB.Designer.cs generated
View File

@@ -1150,12 +1150,14 @@
this.fpSpread1_Sheet1.Columns.Get(23).Tag = "bigo";
this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(23).Width = 119F;
this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17;
this.fpSpread1_Sheet1.Columns.Get(24).DataField = "edate";
this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(24).Label = "입고예정";
this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(24).Width = 119F;
this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18;
this.fpSpread1_Sheet1.Columns.Get(25).DataField = "indate";
this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
@@ -1172,6 +1174,7 @@
this.fpSpread1_Sheet1.Columns.Get(26).Tag = "inqty";
this.fpSpread1_Sheet1.Columns.Get(26).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(26).Width = 119F;
this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19;
this.fpSpread1_Sheet1.Columns.Get(27).DataField = "po";
this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;

12
SubProject/FEQ0000/PurchaseEB/fPurchaseEB.cs
View File

@@ -122,7 +122,8 @@ namespace FEQ0000
cmbState.Items.Add("-- 전체 --");
foreach (var item in stList)
cmbState.Items.Add(item.Value);
cmbState.Items.Add("<=Received");
cmbState.Items.Add("<Received");
//cmbState.Items.Add("App+PR+PO");
this.cmbState.SelectedIndex = 0;
//all기본 - 양진원
@@ -202,10 +203,14 @@ namespace FEQ0000
if (cmbState.SelectedIndex != 0)
{
if (cmbState.Text.ToUpper() == "<=RECEIVED")
if (cmbState.Text.ToUpper() == "<RECEIVED")
{
cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
}
//else if(cmbState.Text.ToUpper() == "APP+PR+PO")
//{
// cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
//}
else
{
cmd.CommandText += " and isnull([state],'') like @st";
@@ -787,6 +792,9 @@ namespace FEQ0000
newdr.indate = string.Empty;
newdr.edate = string.Empty;
newdr.pumqty = 0; //실구매수량은 제거
newdr.chk2 = false;
newdr.chk1 = false;
newdr.SetpumqtyNull();
newdr.idx = -1;
newdr.EndEdit();

50
SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs generated
View File

@@ -158,9 +158,9 @@
this.btViewDel = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -937,30 +937,6 @@
this.fpSpread1.ClipboardPasted += new FarPoint.Win.Spread.ClipboardPastedEventHandler(this.fpSpread1_ClipboardPasted);
this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick);
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(0, 639);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1334, 23);
this.label1.TabIndex = 6;
this.label1.Text = "--";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label2.Location = new System.Drawing.Point(0, 616);
this.label2.Name = "label2";
this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label2.Size = new System.Drawing.Size(1334, 23);
this.label2.TabIndex = 7;
this.label2.Text = "--";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -1325,6 +1301,30 @@
this.fpSpread1_Sheet1.ShowRowSelector = true;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(0, 639);
this.label1.Name = "label1";
this.label1.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label1.Size = new System.Drawing.Size(1334, 23);
this.label1.TabIndex = 6;
this.label1.Text = "--";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label2.Location = new System.Drawing.Point(0, 616);
this.label2.Name = "label2";
this.label2.Padding = new System.Windows.Forms.Padding(5, 0, 0, 0);
this.label2.Size = new System.Drawing.Size(1334, 23);
this.label2.TabIndex = 7;
this.label2.Text = "--";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// fPurchaseNR
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

7
SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs
View File

@@ -126,7 +126,7 @@ namespace FEQ0000
cmbState.Items.Add("-- 전체 --");
foreach (var item in stList)
cmbState.Items.Add(item.Value);
cmbState.Items.Add("<=Received");
cmbState.Items.Add("<Received");
this.cmbState.SelectedIndex = 0; //all기본 - 양진원
//this.cmbCr.SelectedIndex = 1;
@@ -253,7 +253,7 @@ namespace FEQ0000
if (cmbState.SelectedIndex != 0)
{
if (cmbState.Text.ToUpper() == "<=RECEIVED")
if (cmbState.Text.ToUpper() == "<RECEIVED")
{
cmd.CommandText += " and isnull([state],'') in ('','---','Approving','PR','PO')";
}
@@ -847,6 +847,9 @@ namespace FEQ0000
newdr.po = string.Empty;
newdr.indate = string.Empty;
newdr.edate = string.Empty;
newdr.chk1 = false;
newdr.chk2 = false;
newdr.SetpumqtyNull();
newdr.pumqty = 0; //실구매수량은 제거
newdr.idx = -1;
newdr.EndEdit();