This commit is contained in:
chi
2023-09-14 17:40:00 +09:00
parent 5a7b57eab2
commit f6f6db19ff
14 changed files with 1507 additions and 1015 deletions

View File

@@ -1,4 +1,5 @@
using System;
using FCOMMON;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -105,7 +106,7 @@ namespace FCM0000
cmbUser.SelectedIndex = 0;//전체
dtED.Text = DateTime.Now.ToShortDateString();
dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
dtSD.Text = DateTime.Now.AddYears(-1).ToShortDateString();
RefreshData();
}
@@ -129,10 +130,10 @@ namespace FCM0000
}
var place = "%";
if (cmbPlace.SelectedIndex > 0) place = cmbPlace.Text.Trim();
if (cmbPlace.SelectedIndex > 0) place = cmbPlace.Text.Trim() ;
var invtype = "%";
if (cmbInvType.SelectedIndex > 0) invtype = cmbInvType.Text.Trim();
this.ta.Fill(this.dSInventory.vInventory, FCOMMON.info.Login.gcode, sd, ed, userNo, invtype, place);
if (cmbInvType.SelectedIndex > 0) invtype = cmbInvType.Text.Trim();
this.ta.Fill(this.dSInventory.vInventory, FCOMMON.info.Login.gcode, sd, ed, invtype, userNo, place);
this.dSInventory.vInventory.AcceptChanges();
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
@@ -284,7 +285,8 @@ namespace FCM0000
try
{
this.ta.Update(this.dSInventory.vInventory);
var cnt = this.ta.Update(this.dSInventory.vInventory);
FCOMMON.Util.MsgI($"{cnt}건의 자료가 저장 되었습니다");
}
catch (Exception ex)
{
@@ -296,17 +298,32 @@ namespace FCM0000
private void btAdd_Click(object sender, EventArgs e)
{
var newdr = this.dSInventory.vInventory.NewvInventoryRow();
var f = new finventoryAdd(newdr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
newdr.EndEdit();
this.dSInventory.vInventory.AddvInventoryRow(newdr);
int cnt = this.ta.Update(newdr);
newdr.AcceptChanges();
var cnt = ta.Update(newdr);
if (cnt != 1)
FCOMMON.Util.MsgE("자료가 추가되지 않았습니다.\n\n잠시 후 다시 시도하세요");
{
FCOMMON.Util.MsgE("저장이 완료되지 않았습니다");
}
else
{
//방금입력한 자료의 idx를 찾아서 업데이트해아한다.
var taq = new DSInventoryTableAdapters.QueriesTableAdapter();
var idx = taq.GetLastIdx(newdr.gcode, newdr.uid, newdr.invtype, newdr.wuid, newdr.wdate, newdr.item);
newdr.idx = (int)idx;
newdr.EndEdit();
newdr.AcceptChanges();
}
}
else newdr.Delete();
else
{
newdr.Delete();
//newdr.AcceptChanges();
}
}
private void btEdit_Click(object sender, EventArgs e)
@@ -321,11 +338,13 @@ namespace FCM0000
var f = new finventoryAdd(dr);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
if (dr.RowState != DataRowState.Unchanged)
dr.EndEdit();
var cnt = ta.Update(dr);
if (cnt != 1)
{
int cnt = this.ta.Update(dr);
dr.AcceptChanges();
FCOMMON.Util.MsgE("저장이 완료되지 않았습니다");
}
else dr.AcceptChanges();
}
else dr.RejectChanges();
}
@@ -342,16 +361,16 @@ namespace FCM0000
var dlg = FCOMMON.Util.MsgQ("현재 선택된 자료를 삭제하시겠습니까?");
if (dlg != System.Windows.Forms.DialogResult.Yes) return;
dr.Delete();
try
var cnt = ta.Update(dr);
if(cnt != 1)
{
this.ta.Update(dr);
}
catch (Exception ex)
FCOMMON.Util.MsgE("저장 실패");
}else
{
FCOMMON.Util.MsgE("삭제실패\n\n" + ex.Message);
//dr.AcceptChanges();
}
}
@@ -369,7 +388,7 @@ namespace FCM0000
}
else
{
var collist = new string[] { "username","uid","place","itemName","itemModel","serial","memo" };
var collist = new string[] { "username","box","uid","place","itemName","itemModel","serial","memo" };
search = search.Replace("'", "''");
string filter = ""; // "itemna like ? or package like ? or projectname like ? or process like ? or [type] like ? or description like ?";
foreach(var col in collist)