From 64a6c4193199d15d7ac5aa67a9677df01a37a50d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 12 六月 2025 08:04:31 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs |   22 ++++++++++++----------
 1 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
index e3a0900..1ffb78a 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesSctkSq.cs
@@ -16,7 +16,6 @@
         string _webServiceName = "MesSctkSqManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
         string _ucCk = "";//鍙戞枡浠撳簱
-        string _ucGys = "";//渚涘簲鍟�
         public Frm_MesSctkSq()
         {
             InitializeComponent();
@@ -45,7 +44,7 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            //閫夋嫨搴撳瓨缁勭粐锛堜粨搴撳拰渚涘簲鍟嗭級
+            //閫夋嫨搴撳瓨缁勭粐锛堜粨搴擄級
             txt_thOrgId.EditChanged += (s, e) =>
             {
                 var orgId = txt_thOrgId.GetId();
@@ -86,7 +85,7 @@
                             _row["itemName"] = dym.itemName;
                             _row["itemModel"] = dym.itemModel;
                             _row["dwName"] = dym.dwName;
-                            _row["sqNum"] = "";
+                           // _row["sqNum"] = "";
                             _row["ysNum"] = "0";
                             _row["remark"] = "";
                             _Table.Rows.Add(_row);
@@ -98,7 +97,7 @@
                         gvMx1.PostEditor();
                         gvMx1.UpdateCurrentRow();
                         gvMx1.BestFitColumns();
-                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                     }
                     catch (Exception ex)
                     {
@@ -233,7 +232,6 @@
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
 
         /// <summary>
@@ -322,7 +320,7 @@
                 txt_depotId.Focus();
                 return;
             }
-            if (txt_returnType.SelectedIndex <= 0)
+            if (txt_returnType.TextTxt.Length <= 0)
             {
                 MsgHelper.Warning("璇烽�夋嫨閫�鏂欏師鍥狅紒");
                 txt_returnType.Focus();
@@ -334,7 +332,7 @@
                 OrgId = txt_thOrgId.GetId(),//閫夋嫨缁勭粐
                 Remark = txt_remark.Text.Trim(), //澶囨敞
                 DepotId = int.Parse(_ckId),//浠撳簱
-                Reason = txt_returnType.Text,//閫�鏂欏師鍥�
+                Reason = txt_returnType.TextTxt,//閫�鏂欏師鍥�
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -355,6 +353,12 @@
                     if (string.IsNullOrEmpty(_msl))
                     {
                         MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    _msl = row["remark"].ToString();
+                    if (string.IsNullOrEmpty(_msl))
+                    {
+                        MsgHelper.ShowError("鐢宠澶囨敞涓嶈兘涓虹┖锛�");
                         return;
                     }
                     _obj.list.Add(new
@@ -398,7 +402,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "BILL_NO", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -454,13 +458,11 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
-                    _ucGys = dy.suppId;
                     _ucCk = dy.depotId;
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
                     UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-                    _ucGys = "";
                     _ucCk = "";
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();

--
Gitblit v1.9.3