From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs |   65 +++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 8c38d79..d68025e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -29,7 +29,7 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
-           // Gs.DevApp.ToolBox.DragResizeHelp.RegisterControl(this, this.panelControl3, splitContainerControl1.Panel1, label1);
+            this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
             {
@@ -209,7 +209,8 @@
             {
                 List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                 gvList.Add(gvMx1);
-                UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gvList);
+                UtilityHelper.ChangeEnableByControl( splitMx1.Panel1.Controls, true, gvList);
+               
             }
         }
         /// <summary>
@@ -223,7 +224,7 @@
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
             List<DevExpress.XtraGrid.Views.Grid.GridView> gridViews = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
             gridViews.Add(gvMx1);
-            UtilityHelper.CleanValueByControl(this.panel1.Controls, true, gridViews);
+            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
 
         }
@@ -242,12 +243,12 @@
             string dblx = txt_ftranstype.Text.ToString();
             string dchzlx = txt_fOwnerTypeIdHead.Text.ToString();
             string drhzlx = txt_fOwnerTypeInIdHead.Text.ToString();
-            if (txt_fBillTypeID.SelectedIndex <= 0)
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
-                txt_fBillTypeID.Focus();
-                return;
-            }
+            //if (txt_fBillTypeID.SelectedIndex <= 0)
+            //{
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+            //    txt_fBillTypeID.Focus();
+            //    return;
+            //}
             if (txt_fTransferDirect.SelectedIndex <= 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
@@ -304,6 +305,36 @@
                         MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
                         return;
                     }
+                    if (string.IsNullOrEmpty(row["dcOrgGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨嚭缁勭粐涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["dcCkGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨嚭浠撳簱涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["drOrgGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨叆缁勭粐涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["drCkGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨叆浠撳簱涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["dcHzGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨嚭璐т富涓嶈兘涓虹┖锛�");
+                        return;
+                    }
+                    if (string.IsNullOrEmpty(row["drHzGuid"].ToString()))
+                    {
+                        MsgHelper.ShowError("璋冨叆璐т富涓嶈兘涓虹┖锛�");
+                        return;
+                    }
                     _obj.list.Add(new
                     {
                         Guid = _guid,
@@ -331,7 +362,7 @@
                     toolBarMenu1.isSetBtn = true;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gvList);
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                     toolBarMenu1.currentAction = "";
                 }
             }
@@ -420,7 +451,7 @@
                     lbGuid.Text = strGuid;
                     List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
                     gvList.Add(gvMx1);
-                    UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])
@@ -611,11 +642,6 @@
             if (rowhandle < 0)
                 return;
             var dr = gvMx1.GetDataRow(rowhandle);
-            if (dr["dcOrgGuid"] == null)
-            {
-                MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
-                return;
-            };
             var strOrgGuid = dr["dcOrgGuid"].ToString();
             if (string.IsNullOrEmpty(strOrgGuid))
             {
@@ -696,15 +722,10 @@
             if (rowhandle < 0)
                 return;
             var dr = gvMx1.GetDataRow(rowhandle);
-            if (dr["drOrgGuid"] == null)
-            {
-                MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
-                return;
-            };
             var strOrgGuid = dr["drOrgGuid"].ToString();
             if (string.IsNullOrEmpty(strOrgGuid))
             {
-                MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
+                MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
                 return;
             };
             SelectCk frm = new SelectCk(strOrgGuid);

--
Gitblit v1.9.3