From fbe33a615f1c4e798a0f8e58163e68c3ce789614 Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期四, 20 十一月 2025 10:17:49 +0800
Subject: [PATCH] 初始化标准版
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 164 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 126 insertions(+), 38 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index b81bd11..19a3a13 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -46,7 +46,11 @@
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
- }, lbGuid);
+ }, lbGuid, toolBarMenu1
+ , () =>
+ {
+ ucRptCgdhd1.Initialize();
+ });
getPageList(1);
pageBar1.PagerEvent += PageBar1_PagerEvent;
//璁剧疆缁勭粐
@@ -84,21 +88,59 @@
{
var lst = new List<string>();
lst = ee.StringList;
- var _obj = lst;
- var strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectFormTo", JsonConvert.SerializeObject(_obj));
- var dt = UtilityHelper.ReturnToList(strReturn);
- DataTable _newTable = dt.rtnData;
+ string strReturn = "";
+ ReturnModel<DataTable> dt;
DataTable _oldTable = (DataTable)gcMx1.DataSource;
- DataRow[] sourceRows = _newTable.Select();
- for (int i = 0; i < sourceRows.Length; i++)
+ #region 杩欐槸Srm鏉ョ殑鍗曞瓙
+ if (lst == null)
{
- _oldTable.ImportRow(sourceRows[i]);
+ string strSrmNo = "";
+ List<dynamic> lstSrm = new List<dynamic>();
+ lstSrm = ee.DynamicList;
+ strSrmNo = lstSrm[0].guid;
+ txt_paperBillNo.Text = strSrmNo;
+ var _obj = new
+ {
+ inShdh = strSrmNo,
+ inP1 = "",
+ inP2 = ""
+ };
+ strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectSrmTo", JsonConvert.SerializeObject(_obj));
+ dt = UtilityHelper.ReturnToList(strReturn);
+ //绂佹淇敼鏁伴噺
+ gvMx1quantity.OptionsColumn.ReadOnly = true;
+ txt_paperBillNo.ReadOnly = true;
+ txt_isSrm.Checked = true;
+ DataTable _newTable = dt.rtnData;
+ _oldTable = _newTable;
}
+ #endregion
+ #region 杩欐槸鏅�氱殑鍗�
+ else
+ {
+ txt_paperBillNo.Text = "";
+ var _obj = lst;
+ strReturn = UtilityHelper.HttpPost("", _webServiceName + "SelectFormTo", JsonConvert.SerializeObject(_obj));
+ dt = UtilityHelper.ReturnToList(strReturn);
+ //淇敼鏁伴噺
+ gvMx1quantity.OptionsColumn.ReadOnly = false;
+ txt_paperBillNo.ReadOnly = false;
+ txt_isSrm.Checked = false;
+ DataTable _newTable = dt.rtnData;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
+ }
+ #endregion
gcMx1.BindingContext = new BindingContext();
gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
catch (Exception ex)
{
@@ -108,8 +150,6 @@
frm.ShowDialog();
};
}
-
-
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -135,12 +175,17 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
{
- gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- gridView1.ActiveFilter.Clear();
- gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
- frm.UpdateParent += Frm_UpdateParent;
- frm.ShowDialog();
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
+ {
+ gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+ gridView1.ActiveFilter.Clear();
+ gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ frm.UpdateParent += Frm_UpdateParent;
+ frm.ShowDialog();
+ return;
+ }
+ ucRptCgdhd1.ToolBarMenu1_btnQueryClick(sender, e);
}
/// <summary>
@@ -219,12 +264,14 @@
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -235,19 +282,20 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
{
- if (xtraTabControl1.SelectedTabPageIndex == 1)
- getModel(lbGuid.Text.Trim());
- else
+ if (xtraTabControl1.SelectedTabPageIndex == 0)
{
- //_filterList.Clear();
- //if (gridView1.ActiveFilter.Count > 0)
- //{
- // gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
- // gridView1.ActiveFilter.Clear();
- // gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- //}
- //getPageList(1);
getPageList(this.pageBar1.CurrentPage);
+ return;
+ }
+ if (xtraTabControl1.SelectedTabPageIndex == 1)
+ {
+ getModel(lbGuid.Text.Trim());
+ return;
+ }
+ if (xtraTabControl1.SelectedTabPageIndex == 2)
+ {
+ ucRptCgdhd1.ToolBarMenu1_btnLoadClick(sender, e);
+ return;
}
}
@@ -263,7 +311,7 @@
lbGuid, txt_billNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -277,6 +325,10 @@
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼渚涘簲鍟嗗拰缁勭粐srm,绂佺敤
+ setSrm();
+ txt_receiveOrgId.IsReadly = true;
+ txt_suppId.IsReadly = true;
}
/// <summary>
@@ -292,6 +344,10 @@
gridViews.Add(gvMx1);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_receiveOrgId);
+ txt_isSrm.Checked = false;
+ setSrm();
}
/// <summary>
@@ -306,13 +362,13 @@
string _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
if (string.IsNullOrEmpty(_orgId))
{
- MsgHelper.Warning("璇烽�夋嫨鏀舵枡缁勭粐锛�");
+ MsgHelper.ShowError("璇烽�夋嫨鏀舵枡缁勭粐锛�");
txt_receiveOrgId.Focus();
return;
}
if (string.IsNullOrEmpty(_gysId))
{
- MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
+ MsgHelper.ShowError("璇烽�夋嫨渚涘簲鍟嗭紒");
txt_suppId.Focus();
return;
}
@@ -323,6 +379,7 @@
Remark = txt_remark.Text.Trim(), //澶囨敞
SuppId = _gysId, //渚涘簲鍟�
OrgId = _orgId,
+ IsSrm = (txt_isSrm.Checked ? 1 : 0),
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -351,7 +408,7 @@
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
ItemId = int.Parse(row["itemId"].ToString()),
Quantity = decimal.Parse(row["quantity"].ToString()),
- UrgentFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBit(row["urgentFlag"].ToString()),
+ UrgentFlag = (row["urgentFlagTxt"].ToString().Replace(":", "").Replace("鏅��", "").Replace("鎬ユ枡", "").Replace("涓�鑸�", "")),
Remark = row["memo"].ToString(),
});
}
@@ -362,9 +419,9 @@
_webServiceName + "EditModel",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
lbGuid.Text = _rtn.rtnData.outGuid;
txt_billNo.Text = _rtn.rtnData.outNo;
toolBarMenu1.isSetBtn = true;
@@ -374,10 +431,12 @@
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -387,7 +446,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ReceiveOrgId in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
@@ -600,9 +663,9 @@
_webServiceName + _meth,
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -612,10 +675,12 @@
int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
UtilityHelper.SetCheckIco(gridView1, "fstatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -634,5 +699,28 @@
HistoryDhmxcs frm = new HistoryDhmxcs(mxGuid);
frm.ShowDialog();
}
+
+ private void setSrm()
+ {
+ bool isSrm = (txt_isSrm.Checked);
+ if (isSrm == true)
+ {
+ gvMx1quantity.OptionsColumn.ReadOnly = true;
+ txt_paperBillNo.ReadOnly = true;
+ txt_isSrm.Checked = true;
+ txt_receiveOrgId.IsReadly = true;
+ txt_suppId.IsReadly = true;
+ btnSelect.Enabled = false;
+ }
+ else
+ {
+ gvMx1quantity.OptionsColumn.ReadOnly = false;
+ txt_paperBillNo.ReadOnly = false;
+ txt_isSrm.Checked = false;
+ txt_receiveOrgId.IsReadly = false;
+ txt_suppId.IsReadly = false;
+ btnSelect.Enabled = true;
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3