From adc3fd8af6ff791cd3f924890419cd0cba385f51 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 25 七月 2025 15:48:34 +0800
Subject: [PATCH] 调整审核的文字提示

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
index 87834b9..6349208 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
 using DevExpress.XtraGrid.Views.Grid;
@@ -12,6 +7,11 @@
 using MES.Service.Modes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Threading.Tasks;
+using System.Windows.Forms;
 
 namespace Gs.DevApp.DevFrm
 {
@@ -33,7 +33,7 @@
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-           });
+           }, tips);
             Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
             {
                 getModel(value);
@@ -159,14 +159,14 @@
             toolBarMenu1.isSetBtn = false;
             if (string.IsNullOrEmpty(txt_depotCode.Text.Trim()))
             {
-                MsgHelper.Warning("浠撳簱缂栫爜涓嶈兘涓虹┖锛�");
+                MsgHelper.ShowError("浠撳簱缂栫爜涓嶈兘涓虹┖锛�");
                 txt_depotCode.Focus();
                 return;
             }
 
             if (string.IsNullOrEmpty(txt_depotName.Text.Trim()))
             {
-                MsgHelper.Warning("浠撳簱鍚嶇О涓嶈兘涓虹┖锛�");
+                MsgHelper.ShowError("浠撳簱鍚嶇О涓嶈兘涓虹┖锛�");
                 txt_depotName.Focus();
                 return;
             }
@@ -199,22 +199,22 @@
             }
             var _obj = new MesDepots
             {
-                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+                Guid = lbGuid.Text.Trim(),
                 DepotCode = txt_depotCode.Text,
                 DepotName = txt_depotName.Text,
                 Description = txt_description.Text,
+                Remark5=txt_remark5.Text.Trim(),
                 list = lst
             };
-
             try
             {
                 var strJson = UtilityHelper.HttpPost("",
                     _webServiceName + "EditModel",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 if (_rtn.rtnCode > 0)
                 {
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                     lbGuid.Text = _rtn.rtnData;
                     toolBarMenu1.isSetBtn = true;
                     var gridViews = new List<GridView>();
@@ -223,10 +223,12 @@
                     toolBarMenu1.currentAction = "";
                     Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -236,7 +238,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.depot_code", "asc",
                 "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);

--
Gitblit v1.9.3