From b0046e84b9f95ce07dbbd117758da848ede67546 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 28 七月 2025 08:14:05 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
index 091c7cf..9537973 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
@@ -77,11 +77,10 @@
                             _row["itemNo"] = dym.itemNo;
                             _row["itemName"] = dym.itemName;
                             _row["itemModel"] = dym.itemModel;
-                            _row["quantity"]= dym.quantity;
+                            _row["itemBarCodeSl"] = dym.itemBarCodeSl;
                             _row["yxqDate"] = dym.yxqDate;
                             _row["syts"] = dym.syts;
                             _row["cjcs"] = dym.cjcs;
-                            _row["yxqDate2"] = dym.yxqDate2;
                             _row["qckw"] = dym.qckw;
                             _Table.Rows.Add(_row);
                         }
@@ -96,7 +95,7 @@
                     }
                     catch (Exception ex)
                     {
-                        MessageBox.Show(ex.Message);
+                        Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
                     }
                 };
                 frm.ShowDialog();
@@ -219,13 +218,14 @@
                     else
                         Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                     getPageList(this.pageBar1.CurrentPage);
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
 
         }
@@ -265,7 +265,7 @@
                 lbGuid, txt_billNo, gridView1);
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -277,8 +277,11 @@
             {
                 List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                 gvList.Add(gvMx2);
+                gvList.Add(gvMx1);
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
+            //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+            txt_kcOrgId.IsReadly = true;
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -333,7 +336,7 @@
             gvMx1.UpdateCurrentRow();
             if (gvMx1.DataRowCount <= 0)
             {
-                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+                MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏉＄爜鏄庣粏锛�");
                 return;
             }
             for (var i = 0; i < gvMx1.DataRowCount; i++)
@@ -429,7 +432,7 @@
             if (toolBarMenu1.currentAction == "edit") isEdit = true;
             if (string.IsNullOrEmpty(strGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             var _obj = new
@@ -470,13 +473,13 @@
                     JArray array2 = new JArray();
                     foreach (var a in _job["rtnData"]["list2"])
                     {
-                        array.Add(a);
+                        array2.Add(a);
                     }
                     DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
                     if (dt2.Rows.Count > 0)
                     {
                         gcMx2.BindingContext = new BindingContext();
-                        gcMx2.DataSource = dt;
+                        gcMx2.DataSource = dt2;
                         gcMx2.ForceInitialize();
                         gvMx2.BestFitColumns();
                         Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
@@ -509,13 +512,14 @@
                 case 0:
                     strMsg = "鍙嶅鏍�";
                     break;
-            };
+            }
+            ;
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -590,13 +594,15 @@
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     if (_rtn.rtnCode > 0)
                     {
+                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                         getModel(lbGuid.Text);
                     }
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    else
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             }
         }

--
Gitblit v1.9.3