From 09f8d9f072aa048787beb0112267be0bdf0c2423 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 12 七月 2025 16:06:56 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 170 +++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 117 insertions(+), 53 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 2bd6dcc..366629c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -1,16 +1,17 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
using DevExpress.XtraGrid.Views.Grid;
+using Gs.DevApp.DevFrm.Rk;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
{
@@ -23,7 +24,6 @@
public Frm_MesInvItemArn()
{
InitializeComponent();
- pageBar1.PagerEvent += PageBar1_PagerEvent;
toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -31,22 +31,22 @@
toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
- toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
- toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
+ toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+ toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (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;
//璁剧疆缁勭粐
@@ -56,12 +56,6 @@
if (string.IsNullOrEmpty(_orgId))
return;
txt_suppId.getSuppler(_orgId, _ucGys);
- txt_depotsId.getSuppler(_orgId, _ucCk);
- };
- //璁剧疆浠撳簱閫夋嫨
- this.txt_depotsId.EditChanged += (s, e) =>
- {
- txtDepotsCode.Text = this.txt_depotsId.GetCode();
};
//璁剧疆渚涘簲鍟嗛�夋嫨
this.txt_suppId.EditChanged += (s, e) =>
@@ -90,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();
@@ -114,6 +143,7 @@
frm.ShowDialog();
};
}
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -142,7 +172,7 @@
gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
gridView1.ActiveFilter.Clear();
gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
- var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
+ var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
frm.UpdateParent += Frm_UpdateParent;
frm.ShowDialog();
}
@@ -171,24 +201,13 @@
toolBarMenu1.guidKey = rowGuid;
}
- /// <summary>
- /// 鍙嶆楠�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
- {
- _toolCk("EditModelSubmitF");
- }
-
- /// <summary>
- /// 妫�楠�
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+ private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
{
_toolCk("EditModelSubmit");
+ }
+ private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
+ {
+ _toolCk("EditModelSubmitF");
}
/// <summary>
/// 鍙栨秷浜嬩欢
@@ -285,12 +304,16 @@
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(rowGuid);
+ ////濡傛灉鏄痵rm,绂佺敤
+ setSrm();
}
else
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
+ ////濡傛灉鏄痵rm,绂佺敤
+ setSrm();
}
}
@@ -307,6 +330,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>
@@ -318,24 +345,17 @@
{
toolBarMenu1.isSetBtn = false;
string _orgId = txt_receiveOrgId.GetId();
- string _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
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;
- }
- if (string.IsNullOrEmpty(_ckId))
- {
- MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- txt_depotsId.Focus();
return;
}
var _obj = new
@@ -344,8 +364,8 @@
PaperBillNo = txt_paperBillNo.Text.Trim(), //閫佽揣鍗曞彿;
Remark = txt_remark.Text.Trim(), //澶囨敞
SuppId = _gysId, //渚涘簲鍟�
- DepotsId = _ckId,//浠撳簱
OrgId = _orgId,
+ IsSrm = (txt_isSrm.Checked ? 1 : 0),
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -385,20 +405,24 @@
_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;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false);
+ 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);
}
}
@@ -408,7 +432,7 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
"asc", "", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
@@ -489,11 +513,13 @@
gcMx1.DataSource = dt;
gcMx1.ForceInitialize();
gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
else
{
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+
}
else
{
@@ -574,7 +600,6 @@
}
var lst = new List<string>();
lst.Add(mxGuid);
-
var _obj = lst;
try
{
@@ -584,13 +609,14 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
-
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
}
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -639,5 +665,43 @@
}
}
+ /// <summary>
+ /// 鏌ョ湅鍒拌揣璁板綍锛屾牴鎹噰璐槑缁唃uid
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptHistory_ButtonClick(object sender, ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["aboutGuid"].ToString();
+ 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.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