From 2ea047bd801dd9c0f5ed693be452ee67aa8b5ff3 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 11 十一月 2024 19:35:17 +0800
Subject: [PATCH] 质量审核上的五个按钮

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
index 0128048..b33636c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDepot.cs
@@ -184,8 +184,10 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+                getPageList(1, UtilityHelper.GetPageSize());
         }
 
         /// <summary>
@@ -261,9 +263,7 @@
 
             var _obj = new MesDepots
             {
-                Guid = lbGuid.Text.Trim().Length > 0
-                    ? Guid.Parse(lbGuid.Text.Trim())
-                    : Guid.Empty,
+                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
                 DepotCode = txt_depotCode.Text,
                 DepotName = txt_depotName.Text,
                 Description = txt_description.Text,
@@ -300,7 +300,7 @@
             foreach (var itm in _filterList)
                 _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
                                    itm.fileValue + "'");
-            var pgq = new PageQueryModel(curPage, pageSize, "depot_code", "asc",
+            var pgq = new PageQueryModel(curPage, pageSize, "a.depot_code", "asc",
                 "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -392,6 +392,11 @@
                 var mxGuid = dr["guid"].ToString();
                 if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
                     return;
+                if (string.IsNullOrEmpty(mxGuid))
+                {
+                    gvMx1.DeleteRow(rowhandle);
+                    return;
+                }
                 var strJson = "";
                 var lst = new List<string>();
                 lst.Add(mxGuid);

--
Gitblit v1.9.3