From d157667c10afbda2cf8005459bffa78f40d1b033 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期六, 19 七月 2025 14:52:28 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 196 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 169 insertions(+), 27 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index ab2a42d..7ae1cf6 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -18,7 +18,6 @@
List<FilterEntity> _filterList = new List<FilterEntity>();
string _ucKh = "";//棰嗘枡瀹㈡埛
string _ucBm = "";//棰嗘枡閮ㄩ棬
- string _ucCk = "";//鍙戞枡浠撳簱
string _ucHzlx = "";//璐т富绫诲瀷
string _ucHz = "";//璐т富
public Frm_MesItemQt()
@@ -34,7 +33,13 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
- this.toolBarMenu1.getXmlConfig();
+ toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick;
+ toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick;
+ toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick;
+ toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
+ toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
+ toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
+ this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isChk", "", (value) =>
{
@@ -58,7 +63,6 @@
ucLookHuoZhu1.OrgId = _orgId;
ucLookHuoZhu1.HzId = _ucHz;
ucLookHuoZhu1.SetHzLx(_ucHzlx);
- txt_qt008.getSuppler(_orgId, _ucCk);
System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
@@ -84,11 +88,25 @@
txt_qt013.getSuppler(_orgId, _ucKh);
txt_qt009.getSuppler(_orgId, _ucBm);
};
-
+ //閫夋嫨鏉ユ簮鍗曞彿
+ txt_qt035.ButtonClick += (s, e) =>
+ {
+ string strSrmNo = "";
+ SelectDaa frm = new SelectDaa();
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ strSrmNo = lst[0].guid;
+ txt_qt035.Text = strSrmNo;
+ };
+ frm.ShowDialog();
+ };
}
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- _filterList=Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -124,7 +142,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();
}
@@ -240,6 +258,9 @@
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
ucLookHuoZhu1.Enabled = true;
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+ txt_qt023.IsReadly = true;
+ txt_qt024.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -255,6 +276,10 @@
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
ucLookHuoZhu1.Enabled = true;
+
+ //澧炲姞鏃讹紝榛樿缁勭粐
+ string deftOrg = UtilityHelper.GetFirstOrg(txt_qt023);
+ string deftOrg2 = UtilityHelper.GetFirstOrg(txt_qt024);
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -273,7 +298,6 @@
string inLyCus = txt_qt013.GetId();//棰嗙敤瀹㈡埛
string inLyDepart = txt_qt009.GetId();//棰嗙敤閮ㄩ棬
string inKcfx = txt_qt020.Text.Trim();//搴撳瓨鏂瑰悜
- string inFlck = txt_qt008.GetId();//鍙戞枡浠撳簱
if (string.IsNullOrEmpty(inOrgId))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�");
@@ -296,12 +320,6 @@
txt_qt019.Focus();
return;
}
- if (string.IsNullOrEmpty(inFlck))
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍙戞枡浠撳簱锛�");
- txt_qt008.Focus();
- return;
- }
if (string.IsNullOrEmpty(inLyOrg))
{
Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨棰嗙敤缁勭粐锛�");
@@ -313,12 +331,12 @@
Gs.DevApp.ToolBox.MsgHelper.Warning("瀹㈡埛鎴栭儴闂ㄥ繀閫変竴涓紒");
return;
}
- if (txt_qt020.SelectedIndex <= 0)
- {
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
- txt_qt020.Focus();
- return;
- }
+ //if (txt_qt020.SelectedIndex <= 0)
+ //{
+ // Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
+ // txt_qt020.Focus();
+ // return;
+ //}
var _obj = new
{
guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -331,7 +349,7 @@
inLyCus = inLyCus,//棰嗙敤瀹㈡埛
inLyDepart = inLyDepart,//棰嗙敤閮ㄩ棬
inKcfx = inKcfx,//搴撳瓨鏂瑰悜
- inFlck = inFlck,//鍙戞枡浠撳簱
+ inSource = txt_qt035.EditValue,//宸ュ崟鍙�
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -354,12 +372,19 @@
MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
return;
}
+ string _depotId = row["depotId"].ToString();
+ if (string.IsNullOrEmpty(_depotId))
+ {
+ MsgHelper.ShowError("浠撳簱涓嶈兘涓虹┖锛�");
+ return;
+ }
_obj.list.Add(new
{
Guid = _guid,
ItemId = (row["itemId"].ToString()),
Sqsl = (row["qd007"].ToString()),
Bz = (row["qd010"].ToString()),
+ DepotId = row["depotId"].ToString(),
});
}
}
@@ -394,7 +419,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
@@ -430,6 +455,11 @@
}
}
+
+ /// <summary>
+ /// 璇诲彇
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -453,7 +483,6 @@
dynamic dy = _rtn.rtnData;
_ucKh = dy.qt013;
_ucBm = dy.qt009;
- _ucCk = dy.qt008;
_ucHzlx = dy.qt025;
_ucHz = dy.qt018;
lbGuid.Text = strGuid;
@@ -462,7 +491,6 @@
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
_ucKh = "";
_ucBm = "";
- _ucCk = "";
_ucHzlx = "";
_ucHz = "";
ucLookHuoZhu1.Enabled = isEdit;
@@ -518,6 +546,68 @@
}
/// <summary>
+ /// 鍞悗瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnShouHouChkClick(object sender, EventArgs e)
+ {
+ _toolCk(20);
+ }
+
+ /// <summary>
+ /// 鍞悗鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnShouHouFchkClick(object sender, EventArgs e)
+ {
+ _toolCk(21);
+ }
+
+ /// <summary>
+ /// 璐㈠姟瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnCaiWuChkClick(object sender, EventArgs e)
+ {
+ _toolCk(30);
+ }
+ /// <summary>
+ /// 璐㈠姟鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnCaiWuFchkClick(object sender, EventArgs e)
+ {
+ _toolCk(31);
+ }
+ /// <summary>
+ /// 閲囪喘瀹℃牳
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void ToolBarMenu1_btnCaiGouChkClick(object sender, EventArgs e)
+ {
+ _toolCk(40);
+ }
+ /// <summary>
+ /// 閲囪喘鍙嶅鏍�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+
+ private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e)
+ {
+ _toolCk(41);
+ }
+
+ /// <summary>
/// 宸ュ叿鏉′簨浠�
/// </summary>
/// <param name="inFieldValue"></param>
@@ -532,6 +622,24 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 20:
+ strMsg = "鍞悗瀹℃牳";
+ break;
+ case 21:
+ strMsg = "鍞悗鍙嶅鏍�";
+ break;
+ case 30:
+ strMsg = "璐㈠姟瀹℃牳";
+ break;
+ case 31:
+ strMsg = "璐㈠姟鍙嶅鏍�";
+ break;
+ case 40:
+ strMsg = "閲囪喘瀹℃牳";
+ break;
+ case 41:
+ strMsg = "閲囪喘鍙嶅鏍�";
+ break;
};
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
@@ -543,7 +651,6 @@
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
return;
-
var _obj = new
{
guid = rowGuid,
@@ -571,7 +678,6 @@
{
MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
}
-
}
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
{
@@ -582,8 +688,16 @@
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
- }
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ }
+ /// <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;
@@ -624,6 +738,34 @@
}
}
-
+ /// <summary>
+ /// 鏌ユ壘浠撳簱
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptCk_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx1.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ var strOrgGuid = txt_qt023.GetId();
+ if (string.IsNullOrEmpty(strOrgGuid))
+ {
+ MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨搴撳瓨缁勭粐锛�");
+ return;
+ }
+ ;
+ SelectCk frm = new SelectCk(strOrgGuid);
+ frm.UpdateParent += (ss, ee) =>
+ {
+ var lst = new List<dynamic>();
+ lst = ee.DynamicList;
+ gvMx1.SetFocusedRowCellValue("depotName", lst[0].name);
+ gvMx1.SetFocusedRowCellValue("depotId", lst[0].guid);
+ };
+ frm.ShowDialog();
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3