From a516bd113181c846d0176d773770d818aeb59fac Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 06 十一月 2025 08:53:45 +0800
Subject: [PATCH] 工单排产、生产工单、生产入库单、返工列表:显示人员ID改为显示人员姓名

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs |   23 +++++++++++++++++++----
 1 files changed, 19 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..88a231b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -20,9 +20,10 @@
         {
             InitializeComponent();
             this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
+            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) =>
@@ -39,6 +40,9 @@
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
         }
+
+     
+
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -141,7 +145,10 @@
         {
             _toolCk(3);
         }
-
+        private void ToolBarMenu1_btnLockClick(object sender, EventArgs e)
+        {
+            _toolCk(6);
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -149,7 +156,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 +275,11 @@
                 case 3:
                     strMsg = "鍙嶇粨妗堬紙鍙嶆墽琛岃嚦瀹屽伐锛�";
                     break;
-            };
+                case 6:
+                    strMsg = "瑙i攣鐢ㄦ枡娓呭崟";
+                    break;
+            }
+            ;
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,

--
Gitblit v1.9.3