From b401548e93334943320e2a4a6b11341cf8a5fecf Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 24 八月 2025 12:57:01 +0800
Subject: [PATCH] 数据过滤

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
index c9940e3..e07ea37 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.cs
@@ -181,7 +181,7 @@
                 lbGuid, txt_hNo, gridView1, "hNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -339,6 +339,11 @@
                 if (row != null)
                 {
                     Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+                    if (string.IsNullOrEmpty(row["daa025"].ToString()))
+                    {
+                        MsgHelper.ShowError("鐢熶骇绫诲瀷涓嶈兘涓虹┖锛�");
+                        return;
+                    }
                     string _LineId = row["daa015"].ToString();
                     if (string.IsNullOrEmpty(_LineId))
                     {
@@ -367,13 +372,11 @@
                         Guid = _guid,
                         AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["caaGuid"].ToString()),
                         LineId = row["daa015"].ToString(),//浜х嚎id
+                        Hxsj = row["daa025"].ToString(),//鐢熶骇绫诲瀷
                         Yjkgsj = (row["mesStartProd"].ToString()),//棰勮寮�宸ユ椂闂�
-                        Jhrs = row["planPersonnel"].ToString(),//璁″垝浜烘暟
-                        Hxsj = row["changeLinetime"].ToString(),//鎹㈢嚎鏃堕棿
-                        Bz = row["daa009"].ToString(),//澶囨敞
-                        Blsj = row["prepareTime"].ToString(),//棰勮澶囨枡鏃堕棿
+                        Yjwgsj = row["mesEndProd"].ToString(),//棰勮瀹屽伐鏃堕棿
                         Pcsl = row["daa008"].ToString(),//鎺掍骇鏁伴噺
-                        Yjwgsj = row["mesEndProd"].ToString()//棰勮瀹屽伐鏃堕棿
+                        Bz = row["daa009"].ToString(),//澶囨敞
                     });
                 }
             }
@@ -409,7 +412,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

--
Gitblit v1.9.3