From d6cc6e59e67f9ad43bd6c5f373761f94ea77aabf Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 29 十月 2025 11:04:25 +0800
Subject: [PATCH] 增加iqc称重控制

---
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs |   43 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
index 38563dc..97211ad 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MESJJERRORJS.cs
@@ -55,11 +55,13 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
+            txt_DAA001.EditValueChanged += txt_DAA001_EditValueChanged;
 
             //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
             btnSelect.Click += (s, e) =>
             {
-                var frm = new SelectSTAFF();
+                var orgId = txt_OrgId.GetId();
+                var frm = new SelectSTAFF(orgId);
                 //璧嬪�肩粰鏄庣粏琛�
                 frm.UpdateParent += (ss, ee) =>
                 {
@@ -292,7 +294,7 @@
         private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
         {
             string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_ErrorNo, gridView1, "errorNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -368,6 +370,7 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMain1, gridView1);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl1, gridView2);
             txt_ErrorType.EditValue = "璁℃椂宸ユ椂";
+            string deftOrg = UtilityHelper.GetFirstOrg(txt_OrgId);
             GetTimeType();
             GetWOMDAAInfo();
         }
@@ -386,6 +389,7 @@
                 getModel(rowGuid);
             GetTimeType();
             GetWOMDAAInfo();
+            txt_OrgId.IsReadly = true;
         }
 
         /// <summary>
@@ -420,6 +424,7 @@
                 remark = txt_Remark.Text.Trim(),//璇存槑
                 DAA001 = txt_DAA001.Text.Trim(),//宸ュ崟鍙�
                 DAAType = txt_DAAType.Text.Trim(),//宸ュ崟绫诲瀷
+                OrgId = txt_OrgId.GetId().Trim(),//宸ュ崟绫诲瀷
                 list = new List<dynamic>(),
             };
             gridView2.CloseEditor();
@@ -435,7 +440,6 @@
                 var row = gridView2.GetDataRow(i);
                 if (row != null)
                 {
-                    Guid? _guid = UtilityHelper.ToGuid(row["id"].ToString());
                     if (string.IsNullOrEmpty(row["staffId"].ToString()))
                     {
                         MsgHelper.ShowError("鍛樺伐涓嶈兘涓虹┖锛�");
@@ -459,8 +463,8 @@
 
                     _obj.list.Add(new
                     {
-                        Guid = _guid,
-                        ID = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["id"].ToString()),
+                        Guid = "",
+                        ID = "",
                         Staff_Id = row["staffId"].ToString(),
                         Staff_No = row["staffNo"].ToString(),
                         Staff_Name = row["staffName"].ToString(),
@@ -505,8 +509,12 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
+            gcMain1.DataSource = null;
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            _sbSqlWhere.Append(" and a.OrgId in");
+            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
             {
@@ -625,7 +633,7 @@
             ;
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "errorNo");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_ErrorNo, gridView1, "errorNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -765,5 +773,24 @@
             }
             gridView2.RefreshData();
         }
+
+        /// <summary>
+        /// 宸ュ崟涓嬫媺妗嗛�夋嫨浜嬩欢
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void txt_DAA001_EditValueChanged(object sender, EventArgs e)
+        {
+            SearchLookUpEdit lookupEdit = sender as SearchLookUpEdit;
+            DataRowView selectedDataRow = (DataRowView)lookupEdit.GetSelectedDataRow();
+            if (selectedDataRow != null)
+            {
+                txt_DAAType.Text = selectedDataRow["宸ュ崟绫诲瀷"].ToString();
+            }
+            else
+            {
+                txt_DAAType.Text = "";
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3