From 1a080e99a3d5acd4fddb0ff658c369e2a33e41a9 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 08 十一月 2024 14:06:10 +0800
Subject: [PATCH] loading

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs |   41 +++++++++++++++++++++++++++++------------
 1 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 7737a7c..3d7cfae 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -51,6 +51,7 @@
             gvMx3.OptionsFind.ShowSearchNavButtons = false;
             gvMx3.OptionsView.ShowGroupPanel = false;
             txt_itemId.KeyFile = "id";
+            txt_suppId.KeyFile = "id";
             txt_itemId.EditChanged += (s, e) =>
             {
                 txt_itemModel.Text = this.txt_itemId.GetModel();
@@ -77,7 +78,7 @@
         /// <param name="e"></param>
         private void BtnLoad_Click(object sender, EventArgs e)
         {
-            if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛�"))
+            if (!MsgHelper.AskQuestion("纭畾閲嶆柊鍔犺浇妫�楠岄」鐩悧锛岃鎿嶄綔灏嗕細娓呯┖涔嬪墠鐨勬楠岃褰曪紵"))
                 return;
             string strGuid = lbGuid.Text.Trim();
             if (string.IsNullOrEmpty(strGuid))
@@ -110,6 +111,7 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        getList12(dt.Rows[0]["guid"].ToString());
                     }
                     else
                     {
@@ -195,7 +197,7 @@
                 try
                 {
                     var strJson = UtilityHelper.HttpPost("",
-                        _webServiceName + "EdtModelDetail12",
+                        _webServiceName + "EdtModel12",
                         JsonConvert.SerializeObject(_obj));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -332,8 +334,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>
         /// 淇敼浜嬩欢
@@ -374,15 +378,23 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            //if (string.IsNullOrEmpty(txt_account.Text.Trim()))
+            if (string.IsNullOrEmpty(txt_fngDesc.Text.Trim()))
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("鐧诲綍璐﹀彿涓嶈兘涓虹┖锛�");
-                // txt_account.Focus();
+                Gs.DevApp.ToolBox.MsgHelper.Warning("涓嶈壇鎻忚堪涓嶈兘涓虹┖锛�");
+                txt_fngDesc.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(txt_lotNo1.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("澶囨敞鑳戒负绌猴紒");
+                txt_fngDesc.Focus();
                 return;
             }
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+                fngDesc=txt_fngDesc.Text.Trim(),
+                lotNo1=txt_lotNo1.Text.Trim(),
             };
             try
             {
@@ -445,7 +457,7 @@
             }
             _loading.Stop();
         }
-        private void getModel(string strGuid, bool isEdit, int tabIdx)
+        private async void getModel(string strGuid, bool isEdit, int tabIdx)
         {
             if (string.IsNullOrEmpty(strGuid))
             {
@@ -453,13 +465,14 @@
                 return;
             }
             UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
+            UcLoading _loading = new UcLoading();
             var _obj = new
             {
                 guid = strGuid,//涓诲缓
             };
             try
             {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
+                string strJson = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
@@ -495,9 +508,11 @@
             {
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
+
+            _loading.Stop();
         }
 
-      
+
         /// <summary>
         /// 閫夐」鍗″垏鎹�
         /// </summary>
@@ -550,8 +565,9 @@
         /// 鏍规嵁妫�楠岄」鐩鍙栨娊鏍风粨鏋� 
         /// </summary>
         /// <param name="guid5"></param>
-        private void getList12(string guid5)
+        private async void getList12(string guid5)
         {
+            UcLoading _loading = new UcLoading();
             var _obj = new
             {
                 parentGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
@@ -559,7 +575,7 @@
             };
             try
             {
-                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+                var strReturn = await UtilityHelper.HttpPostAsync("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
                 var dd = UtilityHelper.ReturnToList(strReturn);
                 var dt = dd.rtnData;
                 gcMx2.BindingContext = new BindingContext();
@@ -570,6 +586,7 @@
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
+            _loading.Stop();
         }
 
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)

--
Gitblit v1.9.3