From 40036d84a94b47b82b2d6316fb63df5e2847c6df Mon Sep 17 00:00:00 2001 From: lu <123456> Date: 星期四, 10 七月 2025 11:17:46 +0800 Subject: [PATCH] 首检 --- DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 85 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 77 insertions(+), 8 deletions(-) diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs index b81bd11..5f02b53 100644 --- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs +++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs @@ -84,9 +84,44 @@ { 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); + string strReturn = ""; + ReturnModel<DataTable> dt; + #region 杩欐槸Srm鏉ョ殑鍗曞瓙 + if (lst == null) + { + 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; + } + #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; + } + #endregion + DataTable _newTable = dt.rtnData; DataTable _oldTable = (DataTable)gcMx1.DataSource; DataRow[] sourceRows = _newTable.Select(); @@ -107,8 +142,8 @@ }; frm.ShowDialog(); }; - } + } private void GridView1_ColumnFilterChanged(object sender, EventArgs e) @@ -292,6 +327,9 @@ gridViews.Add(gvMx1); UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews); Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + //澧炲姞鏃讹紝榛樿缁勭粐 + string deftOrg = UtilityHelper.GetFirstOrg(txt_receiveOrgId); + setSrm(false); } /// <summary> @@ -306,13 +344,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 +361,7 @@ Remark = txt_remark.Text.Trim(), //澶囨敞 SuppId = _gysId, //渚涘簲鍟� OrgId = _orgId, + IsSrm = (txt_isSrm.Checked ? 1 : 0), list = new List<dynamic>(), }; gvMx1.CloseEditor(); @@ -362,9 +401,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 +413,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); } } @@ -473,6 +514,14 @@ else { UtilityHelper.SetDefaultTable(gcMx1, gvMx1); + } + //濡傛灉鏄痵rm,绂佺敤 + if (txt_isSrm.Checked) + { + setSrm(true); + } + else { + setSrm(false); } } else @@ -634,5 +683,25 @@ HistoryDhmxcs frm = new HistoryDhmxcs(mxGuid); frm.ShowDialog(); } + + private void setSrm(bool isSrm) { + if (isSrm == true) + { + gvMx1quantity.OptionsColumn.ReadOnly = true; + txt_paperBillNo.ReadOnly = true; + txt_isSrm.Checked = true; + txt_receiveOrgId.Enabled = false; + txt_suppId.Enabled = false; + btnSelect.Enabled = false; + } + else { + gvMx1quantity.OptionsColumn.ReadOnly = false; + txt_paperBillNo.ReadOnly = false; + txt_isSrm.Checked = false; + txt_receiveOrgId.Enabled = true; + txt_suppId.Enabled = true; + btnSelect.Enabled = true; + } + } } } \ No newline at end of file -- Gitblit v1.9.3