From ccc1b0d541d8f3bdd2bcb72dd0b5533e68b886d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 09 六月 2025 09:53:37 +0800
Subject: [PATCH] 采购明细报表

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs |  283 ++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 182 insertions(+), 101 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 96b8c05..75dd448 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -7,7 +7,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -29,34 +28,32 @@
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "shState", "", (value) =>
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            });
+
+            }, tips);
             Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
             {
                 getModel(value);
             }, (value) =>
             {
                 getPageList(this.pageBar1.CurrentPage);
-            });
+            }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            //璁剧疆浠撳簱閫夋嫨
-            //txt_invFcode.getSuppler("");
-            //txt_fromFcode.getSuppler("");
-            this.txt_sqOrg.EditChanged += (s, e) =>
+            //璁剧疆鐢宠缁勭粐
+            this.txt_fapporgid.EditChanged += (s, e) =>
             {
-                //txt_fstockoutorgidNo.Text = txt_invFcode.GetOrgName();
-                //txt_fowneroutidhead.Text = txt_invFcode.GetOrgId();
-                var _obj = new
-                {
-                    currentPage = 1,
-                    everyPageSize = 999999,
-                    sortName = "",
-                    keyWhere = "",
-                };
+                string _sqGuid = txt_fapporgid.GetId();
+                if (string.IsNullOrEmpty(_sqGuid))
+                    return;
+                System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+                sbWhere.Append(" and a.FSubsidiary ='" + _sqGuid + "'");
+                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
                 var json = JsonConvert.SerializeObject(_obj);
                 try
                 {
@@ -65,20 +62,33 @@
                     var rtn = UtilityHelper.ReturnToTablePage(strReturn);
                     var dt = rtn.rtnData.list;
                     this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+                    //  repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
+                    //Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView2);
                 }
                 catch (Exception ex)
                 {
                     MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
                 }
             };
-            //this.txt_fromFcode.EditChanged += (s, e) => {
-            //    txt_fstockorgidNo.Text = txt_fromFcode.GetOrgName();
-            //    txt_fowneridhead.Text = txt_fromFcode.GetOrgId();
-            //};
+
+            this.gvMx1.InitNewRow += (s, e) =>
+            {
+                string _orgId = txt_fapporgid.GetId();
+                string _orgName = txt_fapporgid.GetName();
+                if (string.IsNullOrEmpty(_orgId)) return;
+                gvMx1.SetFocusedRowCellValue("dcOrg", _orgName);
+                gvMx1.SetFocusedRowCellValue("dcOrgGuid", _orgId);
+                gvMx1.SetFocusedRowCellValue("drOrg", _orgName);
+                gvMx1.SetFocusedRowCellValue("drOrgGuid", _orgId);
+                gvMx1.SetFocusedRowCellValue("drHz", _orgName);
+                gvMx1.SetFocusedRowCellValue("drHzGuid", _orgId);
+                gvMx1.SetFocusedRowCellValue("dcHz", _orgName);
+                gvMx1.SetFocusedRowCellValue("dcHzGuid", _orgId);
+            };
         }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
         }
@@ -101,7 +111,7 @@
             gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
             gridView1.ActiveFilter.Clear();
             gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList);
+            var frm = new ShowFilter(gridView1.Columns, _filterList, this.GetType().FullName);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
         }
@@ -135,7 +145,7 @@
         {
             string rowGuid = "", rowName = "";
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billno, gridView1, "billno");
+                lbGuid, txt_fBillNo, gridView1, "FBillNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -162,7 +172,6 @@
                         Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                     getPageList(this.pageBar1.CurrentPage);
                 }
-
                 MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
@@ -183,14 +192,15 @@
                 getModel(lbGuid.Text.Trim());
             else
             {
-                _filterList.Clear();
-                if (gridView1.ActiveFilter.Count > 0)
-                {
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    gridView1.ActiveFilter.Clear();
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                }
-                getPageList(1);
+                //_filterList.Clear();
+                //if (gridView1.ActiveFilter.Count > 0)
+                //{
+                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                //    gridView1.ActiveFilter.Clear();
+                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                //}
+                //getPageList(1);
+                getPageList(this.pageBar1.CurrentPage);
             }
         }
         /// <summary>
@@ -201,7 +211,7 @@
         private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
         {
             string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billno, gridView1, "billno");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -216,7 +226,7 @@
             {
                 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>
@@ -230,9 +240,8 @@
             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);
-
         }
         /// <summary>
         /// 淇濆瓨浜嬩欢
@@ -242,31 +251,58 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            // string _inCkId = txt_invFcode.GetId();//鍑�
-            // string _inRkId = txt_fromFcode.GetId();//鍏�
-            //if (string.IsNullOrEmpty(_inCkId))
+            string djlx = txt_fBillTypeID.Text.ToString();
+            string ywlx = txt_fBusinessType.Text.ToString();
+            string dbfx = txt_fTransferDirect.Text.ToString();
+            string sqOrg = txt_fapporgid.GetId();
+            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_invFcode.Focus();
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+            //    txt_fBillTypeID.Focus();
             //    return;
             //}
-            //if (string.IsNullOrEmpty(_inRkId))
+            if (txt_fTransferDirect.SelectedIndex <= 0)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冩嫧鏂瑰悜锛�");
+                txt_fTransferDirect.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(sqOrg))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鐢宠缁勭粐锛�");
+                txt_fapporgid.Focus();
+                return;
+            }
+            //if (txt_fOwnerTypeIdHead.SelectedIndex <= 0)
             //{
-            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀惰揣浠撳簱锛�");
-            //    txt_fromFcode.Focus();
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨嚭璐т富绫诲瀷锛�");
+            //    txt_fOwnerTypeIdHead.Focus();
+            //    return;
+            //}
+            //if (txt_fOwnerTypeInIdHead.SelectedIndex <= 0)
+            //{
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璋冨叆璐т富绫诲瀷锛�");
+            //    txt_fOwnerTypeInIdHead.Focus();
             //    return;
             //}
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                //inCkId = _inCkId,//鍑轰粨
-                //inRkId = _inRkId,//鍏ュ簱
-                inDjlx = txt_fbilltypeid.Text.Trim(),//鍗曟嵁绫诲瀷
-                inDbfx = txt_ftransferdirect.Text.Trim(),//璋冩嫧鏂瑰悜
-                inRemark = txt_remark.Text.Trim(),//澶囨敞
+                djlx = djlx,//鍗曟嵁绫诲瀷
+                ywlx = ywlx,//涓氬姟绫诲瀷
+                dbfx = dbfx,//璋冩嫧鏂瑰悜
+                sqOrg = sqOrg,//瀹¤缁勭粐
+                dblx = dblx,//璋冩嫧绫诲瀷
+                dchzlx = dchzlx,//璋冨嚭璐т富绫诲瀷
+                drhzlx = drhzlx,//璋冨叆璐т富绫诲瀷
+                inRemark = txt_fRemarks.Text.Trim(),//澶囨敞
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
+            gvMx1.PostEditor();
             gvMx1.UpdateCurrentRow();
             if (gvMx1.DataRowCount <= 0)
             {
@@ -285,12 +321,48 @@
                         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,
                         ItemId = (row["itemId"].ToString()),
                         Sqsl = (row["shNum"].ToString()),
                         Bz = (row["remark"].ToString()),
+                        dczz = (row["dcOrgGuid"].ToString()),
+                        dcck = (row["dcCkGuid"].ToString()),
+                        drzz = (row["drOrgGuid"].ToString()),
+                        drck = (row["drCkGuid"].ToString()),
+                        dchz = (row["dcHzGuid"].ToString()),
+                        drhz = (row["drHzGuid"].ToString()),
                     });
                 }
             }
@@ -302,13 +374,13 @@
                 if (_rtn.rtnCode > 0)
                 {
                     lbGuid.Text = _rtn.rtnData.outGuid;
-                    txt_billno.Text = _rtn.rtnData.outNo;
+                    txt_fBillNo.Text = _rtn.rtnData.outNo;
                     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);
-                    //ucLookHuoZhu1.Enabled = false;
+                    List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+                    gvList.Add(gvMx1);
+                    UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
                     toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
             }
             catch (Exception ex)
@@ -316,7 +388,19 @@
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
-
+        /// <summary>
+        /// 鏃ュ織
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_fBillNo, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -324,7 +408,7 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -334,15 +418,16 @@
                 if (dd.rtnCode > 0)
                 {
                     DataTable dt = dd.rtnData.list;
-                    gcMain.BindingContext = new BindingContext();
+                    gcMain1.BindingContext = new BindingContext();
                     gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                     if (dt.Rows.Count > 0)
                     {
-                        gcMain.DataSource = dt;
-                        gcMain.ForceInitialize();
+                        gcMain1.DataSource = dt;
+                        gcMain1.ForceInitialize();
+                        gridView1.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1);
                     }
                     else
-                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
                     gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                     pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
                     pageBar1.CurrentPage = curPage;//褰撳墠椤�
@@ -383,7 +468,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"])
@@ -396,6 +481,8 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                     }
                     else
                     {
@@ -451,7 +538,7 @@
             };
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billno, gridView1, "billno");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_fBillNo, gridView1, "FBillNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -479,25 +566,40 @@
                     }
                     int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                     gridView1.FocusedRowHandle = rowHandle;
-                    UtilityHelper.SetCheckIco(gridView1, "shState", "shBy", "shDate", picCheckBox, this, _inFieldValue.ToString());
+                    UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
                 }
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
+
+
+        /// <summary>
+        /// 閫夋嫨鐗╂枡
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
         {
             SearchLookUpEdit LookupEdit = sender as SearchLookUpEdit;
             DataRowView SelectedDataRow = (DataRowView)LookupEdit.GetSelectedDataRow();
             gvMx1.SetFocusedRowCellValue("itemNo", SelectedDataRow["itemNo"].ToString());
             gvMx1.SetFocusedRowCellValue("itemName", SelectedDataRow["itemName"].ToString());
-            gvMx1.SetFocusedRowCellValue("itemMpdel", SelectedDataRow["itemModel"].ToString());
+            gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
+            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
             gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
+            gvMx1.CloseEditor();
+            gvMx1.PostEditor();
+            gvMx1.UpdateCurrentRow();
         }
 
+        /// <summary>
+        /// 鍒犻櫎鐗╂枡
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             var rowhandle = gvMx1.FocusedRowHandle;
@@ -570,11 +672,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))
             {
@@ -655,15 +752,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);
@@ -717,27 +809,22 @@
         private void rptDrHz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             var rowhandle = gvMx1.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            //var dr = gvMx1.GetDataRow(rowhandle);
-            //if (dr["drCkGuid"] == null)
-            //{
-            //    MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+            //if (rowhandle < 0)
             //    return;
-            //};
-            //var strCkGuid = dr["drCkGuid"].ToString();
-            //if (string.IsNullOrEmpty(strCkGuid))
+            int _drhzlx = txt_fOwnerTypeInIdHead.SelectedIndex;
+            //if (_drhzlx <= 0)
             //{
-            //    MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+            //    MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆璐т富绫诲瀷锛�");
             //    return;
-            //};
-            SelectHz frm = new SelectHz("", "");
+            //}
+            SelectHz frm = new SelectHz("", _drhzlx.ToString());
             frm.UpdateParent += (ss, ee) =>
             {
                 var lst = new List<dynamic>();
                 lst = ee.DynamicList;
                 gvMx1.SetFocusedRowCellValue("drHz", lst[0].name);
                 gvMx1.SetFocusedRowCellValue("drHzGuid", lst[0].guid);
+
             };
             frm.ShowDialog();
         }
@@ -750,21 +837,15 @@
         private void rptDcHz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
             var rowhandle = gvMx1.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            //var dr = gvMx1.GetDataRow(rowhandle);
-            //if (dr["drCkGuid"] == null)
-            //{
-            //    MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+            //if (rowhandle < 0)
             //    return;
-            //};
-            //var strCkGuid = dr["drCkGuid"].ToString();
-            //if (string.IsNullOrEmpty(strCkGuid))
+            int _drhzlx = txt_fOwnerTypeIdHead.SelectedIndex;
+            //if (_drhzlx <= 0)
             //{
-            //    MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨叆浠撳簱锛�");
+            //    MsgHelper.Warning("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭璐т富绫诲瀷锛�");
             //    return;
-            //};
-            SelectHz frm = new SelectHz("", "");
+            //}
+            SelectHz frm = new SelectHz("", _drhzlx.ToString());
             frm.UpdateParent += (ss, ee) =>
             {
                 var lst = new List<dynamic>();

--
Gitblit v1.9.3