From 862e5ac5f10f553f64a8d75c69bb6b2683d0e532 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 21 七月 2025 08:04:57 +0800
Subject: [PATCH] 生产
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 481 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 347 insertions(+), 134 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index c2cf57a..6645a5c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -1,3 +1,6 @@
+using Gs.DevApp.DevFrm.Rk;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -15,6 +18,7 @@
{
string _webServiceName = "MesItemTblManager/";
List<FilterEntity> _filterList = new List<FilterEntity>();
+ string _ucGg = "";
public Frm_MesItemTbl()
{
InitializeComponent();
@@ -27,22 +31,42 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- //toolBarMenu1.btnReportClick += ToolBarMenu1_btnReportClick;
- //toolBarMenu1.btnDesignClick += ToolBarMenu1_btnDesignClick;
+ toolBarMenu1.btnFPiZhunClick += ToolBarMenu1_btnFPiZhunClick;
+ toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "tbl013", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
- });
+ }, tips);
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
getModel(value);
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- });
+ }, lbGuid);
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
+ //璁剧疆缁勭粐
+ txt_tbl023.EditChanged += (s, e) =>
+ {
+ string orgdId = txt_tbl023.GetId();
+ if (string.IsNullOrEmpty(orgdId)) return;
+ txt_tbl002.getSuppler(orgdId, _ucGg);
+ };
+ //璁剧疆宸ュ崟
+ txt_tbl002.EditChanged += (s, e) =>
+ {
+ string daaId = txt_tbl002.GetId();
+ if (string.IsNullOrEmpty(daaId)) return;
+ txt_rwd.Text = txt_tbl002.GetRwd();
+ txt_workName.Text = txt_tbl002.GetWorkName();
+ txt_itemName.Text = txt_tbl002.GetPrdName();
+ txt_itemNo.Text = txt_tbl002.GetPrdNo();
+ };
//閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
{
@@ -75,33 +99,28 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
catch (Exception ex)
{
- MessageBox.Show(ex.Message);
+ MsgHelper.ShowError(ex.Message);
}
};
frm.ShowDialog();
};
-
- gcMx1.MouseClick += GcMx1_MouseClick;
- this.ucBtnPrint1.btnDesignClick += (s, e) =>
+ //鎵撳嵃浜嬩欢
+ this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- ucBtnPrint1.rptParameter = "rpt_SCTL{}";
- };
- this.ucBtnPrint1.btnReportClick += (s, e) =>
- {
- ucBtnPrint1.guidKey = "";
string rowGuid = lbMxGuid.Text.Trim();
ucBtnPrint1.guidKey = rowGuid;
- if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉＄爜鏁伴噺锛�");
txt_iCount_1.Focus();
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+ if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
txt_psnQty_1.Focus();
@@ -114,21 +133,86 @@
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
+ this.ucBtnPrint1.rptParameter = "rpt_SCTL{"
+ + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
+ "," + ""
- + "," + ""
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+ + "," + txt_iCount_1.Text.Trim()//寮犳暟
+ + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
+ "}";
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
+ };
+ //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+ this.ucBtnPrint1.btnAllClick += (s, e) =>
+ {
+ string rowGuid = lbMxGuid.Text.Trim();
+ SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "閲囪喘鍏ュ簱");
+ string strCodeList = "";
+ string strAction = "";
+ frm.UpdateParent += (ss, ee) =>
+ {
+ strCodeList = ee.StringSingle;
+ strAction = ee.Data;
+ };
+ frm.ShowDialog();
+ if (string.IsNullOrEmpty(strCodeList))
+ return;
+ if (strAction == "print")
+ {
+ try
+ {
+ string rptParameter = "rpt_SCTL{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
+ }
+ };
+ gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+ //鎵撳嵃鑷姩璁＄畻
+ txt_psnQty_1.TextChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
+ };
+ radOut.SelectedIndexChanged += (s, e) =>
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
+
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
await Task.Delay(100);
getPageList(1);
}
-
+ /// <summary>
+ /// 鏃ュ織
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
+ }
/// <summary>
/// 鍒嗛〉浜嬩欢
/// </summary>
@@ -148,7 +232,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -163,57 +247,25 @@
getPageList(1);
}
- private void ToolBarMenu1_btnDesignClick(object sender, EventArgs e)
+ /// <summary>
+ /// 鎵瑰噯
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
- toolBarMenu1.rptParameter = "rpt_SCTL{}";
+ _toolCk(2);
}
- private void ToolBarMenu1_btnReportClick(object sender, EventArgs e)
+ /// <summary>
+ /// 鍙嶆壒鍑�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnFPiZhunClick(object sender, EventArgs e)
{
- toolBarMenu1.guidKey = "";
- string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
- lbGuid, txt_billNo, gridView1);
- toolBarMenu1.guidKey = rowGuid;
- if (xtraTabControl1.SelectedTabPageIndex == 0)
- {
- getModel(rowGuid);
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
- if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜寮犳暟锛�");
- txt_iCount_1.Focus();
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
- if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉＄爜鏁伴噺锛�");
- txt_psnQty_1.Focus();
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
- if (lbMxGuid.Text.Trim().Length < 10)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
- this.toolBarMenu1.rptParameter = "return false";
- return;
- }
- this.toolBarMenu1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
- + "," + ""
- + "," + ""
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
- + "}";
+ _toolCk(3);
}
-
-
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -256,7 +308,7 @@
lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -274,15 +326,19 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 0);
- getPageList(1);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ { }
+ else
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+ getPageList(this.pageBar1.CurrentPage);
}
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -297,14 +353,15 @@
getModel(lbGuid.Text.Trim());
else
{
- _filterList.Clear();
- if (gridView1.ActiveFilter.Count > 0)
- {
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- }
- getPageList(1);
+ //_filterList.Clear();
+ //if (gridView1.ActiveFilter.Count > 0)
+ //{
+ // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ // gridView1.ActiveFilter.Clear();
+ // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ //}
+ //getPageList(1);
+ getPageList(this.pageBar1.CurrentPage);
}
}
/// <summary>
@@ -322,7 +379,21 @@
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
- UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(rowGuid);
+ }
+ else
+ {
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ }
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_tbl023.IsReadly = true;
+ txt_tbl002.IsReadly = true;
+ txt_tbl005.ReadOnly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -331,12 +402,16 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
{
- UtilityHelper.JumpToTab(xtraTabControl1, 1);
lbGuid.Text = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gridViews.Add(gvMx1);
- UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
+ gridViews.Add(gvMx2);
+ UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_tbl023);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -347,15 +422,22 @@
{
toolBarMenu1.isSetBtn = false;
string workId = txt_tbl002.GetId();
+ string orgId = txt_tbl023.GetId();
+ if (string.IsNullOrEmpty(orgId.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨缁勭粐锛�");
+ txt_tbl023.Focus();
+ return;
+ }
if (string.IsNullOrEmpty(workId.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨宸ュ崟锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨宸ュ崟锛�");
txt_tbl002.Focus();
return;
}
if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍘熷洜锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍘熷洜锛�");
txt_tbl005.Focus();
return;
}
@@ -364,9 +446,12 @@
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
bz = txt_tbl006.Text.Trim(),//澶囨敞
yy = txt_tbl005.Text.Trim(),//鍘熷洜
+ inDaaGuid = workId,//宸ュ崟
+ inOrgId = orgId,//缁勭粐
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
+ gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
if (gvMx1.DataRowCount <= 0)
{
@@ -385,11 +470,19 @@
MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+ string _tld014 = row["tld014"].ToString();
+ if (string.IsNullOrEmpty(_tld014))
+ {
+ MsgHelper.ShowError("閫�鏂欏娉ㄤ笉鑳戒负绌猴紒");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
- Sl = _sl //鐢宠鏁伴噺
+ Sl = _sl, //鐢宠鏁伴噺
+ Remark = _tld014,
+ Bllb = row["tld015"].ToString().Replace("|", ",")
});
}
}
@@ -397,17 +490,26 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+
if (_rtn.rtnCode > 0)
{
- lbGuid.Text = _rtn.rtnData;
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ lbGuid.Text = _rtn.rtnData.outGuid;
+ txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
- UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -418,8 +520,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
-
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -429,15 +530,16 @@
if (dd.rtnCode > 0)
{
DataTable dt = dd.rtnData.list;
- gcMain.BindingContext = new BindingContext();
+ gcMain1.BindingContext = new BindingContext();
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
if (dt.Rows.Count > 0)
{
- gcMain.DataSource = dt;
- gcMain.ForceInitialize();
+ gcMain1.DataSource = dt;
+ gcMain1.ForceInitialize();
+ gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
}
else
- UtilityHelper.SetDefaultTable(gcMain, gridView1);
+ UtilityHelper.SetDefaultTable(gcMain1, gridView1);
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -452,16 +554,16 @@
{
ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
private void getModel(string strGuid)
{
+ gcMx1.DataSource = null;
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -475,10 +577,24 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
+ _ucGg = dy.tbl002;
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
- UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+ gvList.Add(gvMx2);
+ UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ _ucGg = "";
+ if (txt_tbl005.Text == "鑹搧閫�鏂�")
+ {
+ split99.Panel1.Enabled = false;
+ split99.Panel1.Visible = false;
+ }
+ else
+ {
+ split99.Panel1.Enabled = true;
+ split99.Panel1.Enabled = true;
+ }
+
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -491,21 +607,47 @@
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+ JArray array2 = new JArray();
+ foreach (var a in _job["rtnData"]["list2"])
+ {
+ array2.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt2;
+ gcMx2.ForceInitialize();
+ gvMx2.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
+
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
+ /// <summary>
+ /// 绉诲嚭鐢宠鏄庣粏
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
var rowhandle = gvMx1.FocusedRowHandle;
@@ -535,17 +677,18 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
-
/// <summary>
/// 宸ュ叿鏉′簨浠�
@@ -562,22 +705,50 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ case 2:
+ strMsg = "鎵瑰噯";
+ break;
+ case 3:
+ strMsg = "鍙嶆壒鍑�";
+ break;
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
+ //濡傛灉鏄鏍革紝璇㈤棶瑕佷笉瑕佺敓鎴愯ˉ鏂檅eg
+ string txt_chkOut = "0";
+ if (_inFieldValue == 1 && txt_tbl005.Text.Trim() == "浣滀笟涓嶈壇閫�鏂�")
+ {
+ var frm = new Frm_MesItemTblShow();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ txt_chkOut = ee.StringSingle;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ }
+ //濡傛灉鏄鏍革紝璇㈤棶瑕佷笉瑕佺敓鎴愯ˉ鏂檈nd
+
var _obj = new
{
guid = rowGuid,
inFieldValue = _inFieldValue,
+ chkOut = txt_chkOut
};
try
{
@@ -585,42 +756,84 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
- if (_rtn.rtnCode > 0)
+
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
getModel(lbGuid.Text.Trim());
- else
- getPageList(1);
+ }
+ int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+ gridView1.FocusedRowHandle = rowHandle;
+ Form parentForm = this.FindForm();
+ if (_inFieldValue < 2)
+ UtilityHelper.SetCheckIco(gridView1, "isChk", "tbl011", "tbl012", picCheckBox, parentForm, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
-
}
-
- private void GcMx1_MouseClick(object sender, MouseEventArgs e)
+ /// <summary>
+ /// 閫夋嫨涓嶈壇
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- string rowGuid = Gs.DevApp.ToolBox.UtilityHelper.GetCurrentDoubleRow(gvMx1, e, "tlid");
- if (string.IsNullOrEmpty(rowGuid))
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
return;
- lbMxGuid.Text = rowGuid;
- toolBarMenu1.guidKey = rowGuid;
- var info = gvMx1.CalcHitInfo(e.Location);
- var view = info.View;
- var row = view.GetDataRow(info.RowHandle);
- txtWlid.Text = row["tld002"].ToString();
- txtWlgg.Text = row["tld004"].ToString();
- txtWlmc.Text = row["tld003"].ToString();
- txtQuantity.Text = row["tld004"].ToString();//鐢宠鎬婚噺
- //txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
- //kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
+ UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", " a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'");
+ frm.UpdateParent += (ss, ee) =>
+ {
+ System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
+ var lst = ee.DynamicList;
+ foreach (dynamic dym in lst)
+ {
+ if (stringBuilder.Length > 0)
+ stringBuilder.Append("|");
+ stringBuilder.Append(dym.dicTxt);
+ }
+ gvMx1.SetFocusedRowCellValue("tld015", stringBuilder.ToString());
+ // this.TextTxt = ;
+ };
+ frm.ShowDialog();
+ }
- txtYdy.Text ="";//宸叉墦鍗版�婚噺
- kyPrtQty.Text ="";//鍙墦鍗版�婚噺
+ private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+ {
+ if (e.FocusedRowHandle >= 0)
+ {
+ DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
+ lbMxGuid.Text = row["tlid"].ToString();
+ toolBarMenu1.guidKey = row["tlid"].ToString();
+ txtWlid.Text = row["tld002"].ToString();
+ txtWlgg.Text = row["tld004"].ToString();
+ txtWlmc.Text = row["tld003"].ToString();
+ txtQuantity.Text = row["tld005"].ToString();//鐢宠鎬婚噺
+ txt_yQty.Text = row["ydy"].ToString();//宸叉墦鍗版�婚噺
+ txt_kQty.Text = row["kdy"].ToString();//鍙墦鍗版�婚噺
+ txt_psnQty_1.Text = row["mrtmsl"].ToString(); //榛樿姣忓紶鏉＄爜鏁伴噺
+ }
+ else
+ {
+ lbMxGuid.Text = "";
+ ucBtnPrint1.guidKey = "";
+ txtWlid.Text = "";
+ txtWlgg.Text = "";
+ txtWlmc.Text = "";
+ txtQuantity.Text = "";
+ txt_yQty.Text = "";
+ txt_kQty.Text = "";
+ txt_psnQty_1.Text = "";
+ txt_iCount_1.Text = "";
+ }
}
}
}
\ No newline at end of file
--
Gitblit v1.9.3