From f526e43a7be75b4370c6be30f222eda8bd7d1621 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 三月 2025 11:29:54 +0800
Subject: [PATCH] 仓库报表

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

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
index 3536719..87deb25 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.cs
@@ -140,46 +140,21 @@
                 string _strCmd = txtJianYan.Text.Trim().ToUpper();
                 string _strOK = "OK";
                 string _strNG = "NG";
-                int n = 0;
-                if ((_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
+                if (!(_strCmd.StartsWith(_strOK) || _strCmd.StartsWith(_strNG)))
                 {
-                    if (!_strCmd.Contains("-"))
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴� NG 鍛戒护!");
-                        return;
-                    }
-                    string[] _ary = _strCmd.Split('-');
-                    if (_ary.Length != 2)
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氾細璇锋纭娇鐢∣K 鎴�  NG 鍛戒护!");
-                        return;
-                    }
-                    string _str1 = _ary[0];
-                    if (!(_str1 == _strOK || _str1 == _strNG))
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴�  NG 鍛戒护!");
-                        return;
-                    }
-                    string _str2 = _ary[1];
-                    if (int.TryParse(_str2, out n))
-                    {
-                    }
-                    else
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴�  NG 鍛戒护!");
-                        return;
-                    }
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴� NG 鍛戒护!");
+                    return;
                 }
-                else
+                if (!_strCmd.Contains("-"))
                 {
-                    if (int.TryParse(_strCmd, out n))
-                    {
-                    }
-                    else
-                    {
-                        Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴�  NG 鍛戒护!");
-                        return;
-                    }
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴� NG 鍛戒护!");
+                    return;
+                }
+                string[] _ary = _strCmd.Split('-');
+                if (_ary.Length != 2)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("鍛戒护杈撳叆閿欒锛氳姝g‘浣跨敤OK 鎴�  NG 鍛戒护!");
+                    return;
                 }
                 var _obj = new
                 {
@@ -583,19 +558,33 @@
             };
             try
             {
-                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
-                var dd = UtilityHelper.ReturnToList(strReturn);
-                var dt = dd.rtnData;
+                var strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel12", JsonConvert.SerializeObject(_obj));
+                JObject _job = JObject.Parse(strJson);
+                JArray array = new JArray();
+                foreach (var a in _job["rtnData"]["list"])
+                {
+                    array.Add(a);
+                }
+                DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
                 gcMx2.BindingContext = new BindingContext();
                 gcMx2.DataSource = dt;
                 gcMx2.ForceInitialize();
                 gvMx2.BestFitColumns();
+                JArray array1 = new JArray();
+                foreach (var a in _job["rtnData"]["list2"])
+                {
+                    array1.Add(a);
+                }
+                DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+                gcMx3.BindingContext = new BindingContext();
+                gcMx3.DataSource = dt1;
+                gcMx3.ForceInitialize();
+                gvMx3.BestFitColumns();
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
 
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)

--
Gitblit v1.9.3