From 07524287033977cdb0cf45c66f2c3b5d8cc44fb7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 30 十月 2025 08:41:49 +0800
Subject: [PATCH] 委外加上完结

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
index 9f52cfd..88a231b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womcaa.cs
@@ -20,12 +20,13 @@
         {
             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, "fstatus", "", (value) =>
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, null, "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
             }, tips);
@@ -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
@@ -182,7 +193,7 @@
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
 
         }
@@ -237,11 +248,11 @@
                     }
                 }
                 else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -264,14 +275,18 @@
                 case 3:
                     strMsg = "鍙嶇粨妗堬紙鍙嶆墽琛岃嚦瀹屽伐锛�";
                     break;
-            };
+                case 6:
+                    strMsg = "瑙ｉ攣鐢ㄦ枡娓呭崟";
+                    break;
+            }
+            ;
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                 lbGuid, txt_caa001, gridView1, "caa001");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -288,9 +303,9 @@
                     _webServiceName + "EditModelSubmit",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                 if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                 {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
                     {
                         getModel(lbGuid.Text.Trim());
@@ -303,10 +318,12 @@
                         gridView1.FocusedRowHandle = rowHandle;
                     }
                 }
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg.ToString());
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 

--
Gitblit v1.9.3