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

..

Browse Source
This commit is contained in:
chi
2023-08-17 11:55:09 +09:00
parent 299fce9038
commit b98a125f78
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SubProject/FEQ0000/Purchase/fPurchaseNR.cs
View File

@@ -1329,7 +1329,13 @@ namespace FEQ0000
foreach (var idx in f.chklist) foreach (var idx in f.chklist)
{ {
var dr = newlist.Where(t => t.idx == idx).FirstOrDefault(); var dr = newlist.Where(t => t.idx == idx).FirstOrDefault();
if (dr != null) { cnt += 1; dr.chk2 = true; dr.EndEdit(); } if (dr != null)
{
cnt += 1;
dr.chk2 = true;
if (dr.IspumqtyNull() || dr.pumqty == 0) dr.pumqty = dr.pumqtyReq;
dr.EndEdit();
}
} }
FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다"); FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다");
} }

4
SubProject/FEQ0000/Purchase/fSIDCheckNR.cs
View File

@@ -29,7 +29,7 @@ namespace FEQ0000.Purchase
newdr.pumname = item.pumname; newdr.pumname = item.pumname;
newdr.pumscale = item.pumscale; newdr.pumscale = item.pumscale;
newdr.pumunit = item.pumunit; newdr.pumunit = item.pumunit;
newdr.pumqty = item.pumqty; newdr.pumqty = item.pumqtyReq;
newdr.pumprice = item.pumprice; newdr.pumprice = item.pumprice;
newdr.pumamt = item.pumamt; newdr.pumamt = item.pumamt;
newdr.supply = item.supply; newdr.supply = item.supply;
@@ -60,7 +60,7 @@ namespace FEQ0000.Purchase
newdr.pumname = item.pumname; newdr.pumname = item.pumname;
newdr.pumscale = item.pumscale; newdr.pumscale = item.pumscale;
newdr.pumunit = item.pumunit; newdr.pumunit = item.pumunit;
newdr.pumqty = item.pumqty; newdr.pumqty = item.pumqtyReq;
newdr.pumprice = item.pumprice; newdr.pumprice = item.pumprice;
newdr.pumamt = item.pumamt; newdr.pumamt = item.pumamt;
newdr.supply = item.supply; newdr.supply = item.supply;

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

@@ -126,11 +126,11 @@ namespace FEQ0000
cmbState.Items.Add(item.Value); cmbState.Items.Add(item.Value);
cmbState.Items.Add("<=Received"); cmbState.Items.Add("<=Received");
this.cmbState.SelectedIndex = 0; //all기본 - 양진원 this.cmbState.SelectedIndex = 0; //all기본 - 양진원
//this.cmbCr.SelectedIndex = 1; //this.cmbCr.SelectedIndex = 1;
//일반사용자의경우에는 상태를 변경하지 못한다. //일반사용자의경우에는 상태를 변경하지 못한다.
fpSpread1.ActiveSheet.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange; fpSpread1.ActiveSheet.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange;
fpSpread1.ActiveSheet.OperationMode = FarPoint.Win.Spread.OperationMode.Normal; fpSpread1.ActiveSheet.OperationMode = FarPoint.Win.Spread.OperationMode.Normal;
fpSpread1.ActiveSheet.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Cell; fpSpread1.ActiveSheet.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Cell;
@@ -1220,7 +1220,7 @@ namespace FEQ0000
return; return;
} }
} }
var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx,string.Empty); var f = new FEQ0000.Purchase.fPurchaseCR_Ipgo(dr.idx, string.Empty);
if (f.ShowDialog() == DialogResult.OK) if (f.ShowDialog() == DialogResult.OK)
{ {
refreshData(); refreshData();
@@ -1250,8 +1250,8 @@ namespace FEQ0000
//if (fi.Directory.Exists == false) fi.Directory.Create(); //if (fi.Directory.Exists == false) fi.Directory.Create();
// var xlsrow = 0; // var xlsrow = 0;
// var xlscol = 0; // var xlscol = 0;
var sb = new System.Text.StringBuilder(); var sb = new System.Text.StringBuilder();
Dictionary<string, int> userlist = new Dictionary<string, int>(); Dictionary<string, int> userlist = new Dictionary<string, int>();
foreach (var idx in selidx) foreach (var idx in selidx)
@@ -1277,7 +1277,7 @@ namespace FEQ0000
} }
data[0] = sid; data[0] = sid;
data[3-1] = qty.ToString(); data[3 - 1] = qty.ToString();
data[8 - 1] = plant; data[8 - 1] = plant;
data[12 - 1] = requestname; data[12 - 1] = requestname;
data[13 - 1] = eecode; data[13 - 1] = eecode;
@@ -1329,7 +1329,13 @@ namespace FEQ0000
foreach (var idx in f.chklist) foreach (var idx in f.chklist)
{ {
var dr = newlist.Where(t => t.idx == idx).FirstOrDefault(); var dr = newlist.Where(t => t.idx == idx).FirstOrDefault();
if (dr != null) { cnt += 1; dr.chk2 = true; dr.EndEdit(); } if (dr != null)
{
cnt += 1;
dr.chk2 = true;
if(dr.IspumqtyNull() || dr.pumqty == 0) dr.pumqty = dr.pumqtyReq;
dr.EndEdit();
}
} }
FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다"); FCOMMON.Util.MsgI($"{cnt}건의 자료가 [구매담당확인] 되었습니다\n저장을 눌러야 최종 적용 됩니다");
} }