From 7ee945cea3e619d5776d7e155cb6cd7b73cc476f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 25 六月 2025 13:26:35 +0800
Subject: [PATCH] 超期

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

diff --git a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
index 6334487..0a3d48b 100644
--- a/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
+++ b/DevApp/Gs.DevApp/DevFrm/RkQC/Frm_Cqsq.cs
@@ -13,7 +13,7 @@
 {
     public partial class Frm_Cqsq : DevExpress.XtraEditors.XtraForm
     {
-        string _webServiceName = "MesCgthSqManager/";
+        string _webServiceName = "RkqcSqManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
         public Frm_Cqsq()
         {
@@ -60,10 +60,38 @@
                     return;
                 }
                  var frm = new SelectCqsq(this.txt_kcOrgId.GetId());
-                ////璧嬪�肩粰鏄庣粏琛�
+                //璧嬪�肩粰鏄庣粏琛�
                 frm.UpdateParent += (ss, ee) =>
                 {
-                     
+                    try
+                    {
+                        var lst = ee.DynamicList;
+                        DataTable _Table = (DataTable)gcMx1.DataSource;
+                        foreach (dynamic dym in lst)
+                        {
+                            DataRow _row = _Table.NewRow();
+                            _row["guid"] = "";//鏄庣粏guid
+                            _row["pGuid"] = "";//涓昏〃guid
+                            _row["itemBarCode"] = dym.itemBarCode;
+                            _row["itemId"] = dym.itemId;
+                            _row["itemNo"] = dym.itemNo;
+                            _row["itemName"] = dym.itemName;
+                            _row["itemModel"] = dym.itemModel;
+                            _Table.Rows.Add(_row);
+                        }
+                        gcMx1.BindingContext = new BindingContext();
+                        gcMx1.DataSource = _Table;
+                        gcMx1.ForceInitialize();
+                        gvMx1.CloseEditor();
+                        gvMx1.PostEditor();
+                        gvMx1.UpdateCurrentRow();
+                        gvMx1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
+                    }
+                    catch (Exception ex)
+                    {
+                        MessageBox.Show(ex.Message);
+                    }
                 };
                 frm.ShowDialog();
             };
@@ -242,7 +270,7 @@
             else
             {
                 List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-                gvList.Add(gvMx1);
+                gvList.Add(gvMx2);
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
         }
@@ -257,8 +285,10 @@
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
             List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             gridViews.Add(gvMx1);
+            gridViews.Add(gvMx2);
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
             //澧炲姞鏃讹紝榛樿缁勭粐
             string deftOrg = UtilityHelper.GetFirstOrg(txt_kcOrgId);
 
@@ -288,7 +318,7 @@
             {
                 Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
                 Remark = txt_remark.Text.Trim(), //澶囨敞
-                BillType = txt_billType.Text,//閫�鏂欐柟寮�
+                BillType = txt_billType.Text,
                 KcOrgId = _orgId,
                 list = new List<dynamic>(),
             };
@@ -306,18 +336,10 @@
                 if (row != null)
                 {
                     Guid _guid = UtilityHelper.ToGuid(row["guid"].ToString());
-                    string _msl = row["sqsl"].ToString();
-                    if (string.IsNullOrEmpty(_msl))
-                    {
-                        MsgHelper.ShowError("鐢宠鏁伴噺涓嶈兘涓虹┖锛�");
-                        return;
-                    }
                     _obj.list.Add(new
                     {
                         Guid = _guid,
-                        DepotSectionCode = row["depotSectionCode"].ToString(),
-                        Gqsl = row["gqsl"].ToString(),
-                        ItemId = row["itemId"].ToString(),
+                        ItemBarCode = row["itemBarCode"].ToString(),
                     });
                 }
             }
@@ -327,7 +349,6 @@
                     _webServiceName + "EditModel",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
                 if (_rtn.rtnCode > 0)
                 {
                     MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -335,7 +356,7 @@
                     txt_billNo.Text = _rtn.rtnData.outNo;
                     toolBarMenu1.isSetBtn = true;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-                    gvList.Add(gvMx1);
+                    gvList.Add(gvMx2);
                     UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                     toolBarMenu1.currentAction = "";
                     Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
@@ -440,7 +461,6 @@
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
                     }
-
                     JArray array2 = new JArray();
                     foreach (var a in _job["rtnData"]["list2"])
                     {
@@ -526,8 +546,9 @@
             }
         }
 
+
         /// <summary>
-        /// 鍒犻櫎鏄庣粏
+        /// 绉诲嚭鏄庣粏
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -563,7 +584,7 @@
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     if (_rtn.rtnCode > 0)
                     {
-                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+                     getModel(lbGuid.Text);
                     }
                     MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
@@ -573,7 +594,5 @@
                 }
             }
         }
-
-        
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3