From 1708934e25d663104182867b4c238a0c1531352f Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期五, 28 十一月 2025 13:44:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs | 67 +++++++++++++++++++++++++++++++--
1 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index d1f2ac5..e9fea26 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -23,6 +23,7 @@
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
this.toolBarMenu1.btnJieAnClick += ToolBarMenu1_btnJieAnClick1;
this.toolBarMenu1.btnFjieAnClick += ToolBarMenu1_btnFjieAnClick;
+ this.toolBarMenu1.btnLockClick += ToolBarMenu1_btnLockClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, null, "", (value) =>
@@ -79,7 +80,6 @@
_filterList = e.FilterList;
getPageList(1);
}
-
/// <summary>
/// 鍒锋柊浜嬩欢
@@ -141,7 +141,10 @@
{
_toolCk(3);
}
-
+ private void ToolBarMenu1_btnLockClick(object sender, EventArgs e)
+ {
+ _toolCk(6);
+ }
/// <summary>
///
/// </summary>
@@ -149,7 +152,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.ERP_SCZZ in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -264,7 +271,11 @@
case 3:
strMsg = "鍙嶇粨妗堬紙鍙嶆墽琛岃嚦瀹屽伐锛�";
break;
- };
+ case 6:
+ strMsg = "瑙ｉ攣鐢ㄦ枡娓呭崟";
+ break;
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
@@ -312,5 +323,53 @@
}
}
+ /// <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;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx1.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ var mxItemName = dr["itemName"].ToString();
+ var wlbm = dr["wlbm"].ToString();
+ var isLockTxt = dr["isLockTxt"].ToString();
+ if (!isLockTxt.StartsWith("1:"))
+ {
+ MsgHelper.ShowError("璇ョ墿鏂欐病鍔犻攣锛屾搷浣滃け璐ワ紒");
+ return;
+ }
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + wlbm + "锛�" + mxItemName + "銆戯紝纭畾瑙ｉ攣鐢ㄦ枡娓呭崟鍚楋紵"))
+ return;
+ var _obj = new
+ {
+ guid = mxGuid,
+ inFieldValue = 0,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("",
+ _webServiceName + "EditModelSubmitLock",
+ JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
+ {
+ getModel(lbGuid.Text.Trim());
+ }
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg.ToString());
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3