From 4c09363b9dc423003848ae4861414e5357129bfb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 19 六月 2025 16:44:49 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs |  448 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 278 insertions(+), 170 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 8cd1442..e3b570f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -1,5 +1,5 @@
 using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.Base.ViewInfo;
+using Gs.DevApp.DevFrm.Work;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -10,14 +10,17 @@
 using System.Data;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-
-
 namespace Gs.DevApp.DevFrm
 {
     public partial class Frm_MesItemQtrk : DevExpress.XtraEditors.XtraForm
     {
         string _webServiceName = "MesItemQtrkManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
+        string _ucGys = "";//渚涘簲鍟�
+        string _ucBm = "";//棰嗘枡閮ㄩ棬
+        string _ucCk = "";//鍙戞枡浠撳簱
+        string _ucHzlx = "";//璐т富绫诲瀷
+        string _ucHz = "";//璐т富
         public Frm_MesItemQtrk()
         {
             InitializeComponent();
@@ -28,98 +31,79 @@
             this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
             this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
             this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
-            toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
+            this.toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
+            this.toolBarMenu1.btnCaiGouChkClick += ToolBarMenu1_btnCaiGouChkClick;
+            this.toolBarMenu1.btnCaiGouFchkClick += ToolBarMenu1_btnCaiGouFchkClick;
+            this.toolBarMenu1.btnCaiWuChkClick += ToolBarMenu1_btnCaiWuChkClick;
+            this.toolBarMenu1.btnCaiWuFchkClick += ToolBarMenu1_btnCaiWuFchkClick;
+            this.toolBarMenu1.getXmlConfig();
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "qt015", "", (value) =>
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "isSh", "", (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_qt011.getSuppler("");
-            txt_qt018.getSuppler("");
-            //璁剧疆浠撳簱閫夋嫨
-            this.txt_qt011.EditChanged += (s, e) =>
+            //閫夋嫨搴撳瓨缁勭粐锛堝彉鏄庣粏涓殑鐗╂枡鍜屽彉璐т富锛�
+            this.txt_qt022.EditChanged += (s, e) =>
             {
-
-            };
-            //璁剧疆渚涘簲鍟嗛�夋嫨
-            this.txt_qt018.EditChanged += (s, e) =>
-            {
-
-            };
-            var _obj = new
-            {
-                currentPage = 1,
-                everyPageSize = 999999,
-                sortName = "",
-                keyWhere = "",
-            };
-            var json = JsonConvert.SerializeObject(_obj);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                    "MesItemsManager/GetListSelect", json);
-                var rtn = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = rtn.rtnData.list;
-                this.repositoryItemSearchLookUpEdit1.DataSource = dt;
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
-            this.ucBtnPrint1.btnDesignClick += (s, e) =>
-            {
-                ucBtnPrint1.rptParameter = "rpt_Qtrk{}";
-            };
-            this.ucBtnPrint1.btnReportClick += (s, e) =>
-            {
-                ucBtnPrint1.guidKey = "";
-                string rowGuid = lbMxGuid.Text.Trim();
-                ucBtnPrint1.guidKey = rowGuid;
-                if (string.IsNullOrEmpty(txt_iCount_1.Text.Trim()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜寮犳暟锛�");
-                    txt_iCount_1.Focus();
-                    this.ucBtnPrint1.rptParameter = "return false";
+                string _orgId = txt_qt022.GetId();
+                if (string.IsNullOrEmpty(_orgId))
                     return;
-                }
-                if (string.IsNullOrEmpty(txt_psnQty_1.Text.Trim()))
+                ucLookHuoZhu1.OrgId = _orgId;
+                ucLookHuoZhu1.HzId = _ucHz;
+                ucLookHuoZhu1.SetHzLx(_ucHzlx);
+                txt_qt009.getSuppler(_orgId, _ucBm);
+                txt_qt018.getSuppler(_orgId, _ucGys);
+                txt_qt008.getSuppler(_orgId, _ucCk);
+                System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
+                sbWhere.Append(" and a.FSubsidiary ='" + _orgId + "'");
+                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), "");
+                var json = JsonConvert.SerializeObject(_obj);
+                try
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
-                    txt_psnQty_1.Focus();
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
+                    var strReturn = UtilityHelper.HttpPost("",
+                        "MesItemsManager/GetListSelect", json);
+                    var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+                    var dt = rtn.rtnData.list;
+                    this.repositoryItemSearchLookUpEdit1.DataSource = dt;
                 }
-                if (lbMxGuid.Text.Trim().Length < 10)
+                catch (Exception ex)
                 {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
                 }
-                this.ucBtnPrint1.rptParameter = "rpt_Qtrk{" + lbMxGuid.Text.Trim()
-                       + "," + ""
-                       + "," + ""
-                       + "," + txt_iCount_1.Text.Trim()
-                       + "," + txt_psnQty_1.Text.Trim()
-                       + "}";
             };
+         
         }
- 
+
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
             Task.Delay(100);
             getPageList(1);
+        }
+        /// <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_qtck, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
         }
 
         /// <summary>
@@ -141,7 +125,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();
         }
@@ -174,7 +158,7 @@
         {
             string rowGuid = "", rowName = "";
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_qtck, gridView1, "qtck");
+                lbGuid, txt_qtck, gridView1,"qtck");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -196,11 +180,11 @@
                 if (_rtn.rtnCode > 0)
                 {
                     if (xtraTabControl1.SelectedTabPageIndex == 0)
-                        getPageList(this.pageBar1.CurrentPage);
+                    { }
                     else
                         Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
+                    getPageList(this.pageBar1.CurrentPage);
                 }
-
                 MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
@@ -220,14 +204,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>
@@ -246,7 +231,18 @@
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            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);
+                ucLookHuoZhu1.Enabled = true;
+            }
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -259,8 +255,13 @@
             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);
+            gridViews.Add(gvMx2);
+            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
             Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+            ucLookHuoZhu1.Enabled = true;
+            //澧炲姞鏃讹紝榛樿缁勭粐
+            string deftOrg = UtilityHelper.GetFirstOrg(txt_qt022);
         }
         /// <summary>
         /// 淇濆瓨浜嬩欢
@@ -270,32 +271,68 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            string inGys = txt_qt018.GetId();
-            string inCjId = txt_qt011.GetId();
-            if (string.IsNullOrEmpty(inGys))
+            string kcZz = txt_qt022.GetId();//搴撳瓨缁勭粐
+            string kcBm = txt_qt009.GetId();//搴撳瓨閮ㄩ棬
+            string kcGys = txt_qt018.GetId();//搴撳瓨渚涘簲鍟�
+            string djLx = txt_qt003.TextTxt.Trim();//鍗曟嵁绫诲瀷
+            string kcfx = txt_qt019.Text.Trim();//搴撳瓨鏂瑰悜
+            string inHzlx = ucLookHuoZhu1.GetHzLx();//璐т富绫诲瀷
+            string inHz = ucLookHuoZhu1.GetHzId();//璐т富
+            string inRkyy = txt_qt010.Text.Trim();//鍏ュ簱鍘熷洜
+            string kcCk = txt_qt008.GetId();//浠撳簱
+            if (string.IsNullOrEmpty(kcZz))
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
-                txt_qt018.Focus();
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨缁勭粐锛�");
+                txt_qt022.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(inCjId))
+            if (string.IsNullOrEmpty(inHzlx))
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
-                txt_qt011.Focus();
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富绫诲瀷锛�");
                 return;
             }
+            if (string.IsNullOrEmpty(inHz))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨璐т富锛�");
+                return;
+            }
+            if (txt_qt003.TextTxt.Length < 0)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+                txt_qt003.Focus();
+                return;
+            }
+            if (txt_qt019.SelectedIndex <= 0)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨搴撳瓨鏂瑰悜锛�");
+                txt_qt019.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(kcBm) && string.IsNullOrEmpty(kcGys))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.Warning("閮ㄩ棬鎴栦緵搴斿晢蹇呴』閫変竴涓紒");
+                txt_qt009.Focus();
+                return;
+            }
+            //if (string.IsNullOrEmpty(kcCk))
+            //{
+            //    Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鏀舵枡浠撳簱锛�");
+            //    txt_qt008.Focus();
+            //    return;
+            //}
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                inRklb = txt_qt003.Text.Trim(),//澶囨敞
-                inYwlx = txt_qt004.Text.Trim(),//涓氬姟绫诲瀷
-                inRkfs = txt_qt019.Text.Trim(),//鍏ュ簱鏂瑰紡
-                inRklx = txt_qt020.Text.Trim(),//鍏ュ簱绫诲瀷
-                inGys = inGys,//渚涘簲鍟�
-                inCjId = inCjId,//鍏ュ簱浠撳簱
-                inDepart = txt_qt009.GetId(),//鐢宠閮ㄩ棬
-                inXsdh = txt_qt021.Text.Trim(),//閿�鍞崟鍙�
-                inRkyy = txt_qt010.Text.Trim(),//鍏ュ簱鍘熷洜
+                kcZz = kcZz,//搴撳瓨缁勭粐
+                kcBm = kcBm,//搴撳瓨閮ㄩ棬
+                kcGys = kcGys,//搴撳瓨渚涘簲鍟�
+                kcCk = kcCk,//搴撳瓨浠撳簱
+                inRkyy = inRkyy,//鍏ュ簱鍘熷洜
+                djLx = djLx,//鍗曟嵁绫诲瀷
+                kcfx = kcfx,//搴撳瓨鏂瑰悜
+                hzlx = inHzlx,//璐т富绫诲瀷
+                inHz = inHz,//璐т富
+                inSource = txt_qt035.EditValue,//宸ュ崟鍙�
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -323,6 +360,7 @@
                         ItemId = (row["itemId"].ToString()),
                         Sqsl = (row["qd007"].ToString()),
                         Bz = (row["qd010"].ToString()),
+                        Bllb = (row["qd012"].ToString()),
                     });
                 }
             }
@@ -333,9 +371,16 @@
                 ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 if (_rtn.rtnCode > 0)
                 {
-                    lbGuid.Text = _rtn.rtnData;
+                    lbGuid.Text = _rtn.rtnData.outGuid;
+                    txt_qtck.Text = _rtn.rtnData.outNo;
                     toolBarMenu1.isSetBtn = true;
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false);
+                    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);
+                    ucLookHuoZhu1.Enabled = false;
+                    toolBarMenu1.currentAction = "";
+                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
             }
             catch (Exception ex)
@@ -351,8 +396,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, "qt001", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -362,15 +406,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;//褰撳墠椤�
@@ -385,10 +430,14 @@
             {
                 ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
-
         }
+        /// <summary>
+        /// 璇诲彇瀹炰綋
+        /// </summary>
+        /// <param name="strGuid"></param>
         private void getModel(string strGuid)
         {
+            gcMx1.DataSource = null;
             bool isEdit = false;
             if (toolBarMenu1.currentAction == "add") return;
             if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -408,10 +457,22 @@
                 if (_rtn.rtnCode > 0)
                 {
                     dynamic dy = _rtn.rtnData;
+                    _ucGys = dy.qt018;
+                    _ucBm = dy.qt009;
+                    _ucCk = dy.qt008;
+                    _ucHzlx = dy.qt023;
+                    _ucHz = dy.qt024;
                     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);
+                    gvList.Add(gvMx2);
+                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+                    _ucGys = "";
+                    _ucBm = "";
+                    _ucCk = "";
+                    _ucHzlx = "";
+                    _ucHz = "";
+                    ucLookHuoZhu1.Enabled = isEdit;
                     JObject _job = JObject.Parse(strJson);
                     JArray array = new JArray();
                     foreach (var a in _job["rtnData"]["list"])
@@ -424,10 +485,30 @@
                         gcMx1.BindingContext = new BindingContext();
                         gcMx1.DataSource = dt;
                         gcMx1.ForceInitialize();
+                        gvMx1.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                     }
                     else
                     {
                         Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
+                    }
+                    JArray array2 = new JArray();
+                    foreach (var a in _job["rtnData"]["list2"])
+                    {
+                        array2.Add(a);
+                    }
+                    DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(array2.ToString());
+                    if (dt2.Rows.Count > 0)
+                    {
+                        gcMx2.BindingContext = new BindingContext();
+                        gcMx2.DataSource = dt2;
+                        gcMx2.ForceInitialize();
+                        gvMx2.BestFitColumns();
+                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
+                    }
+                    else
+                    {
+                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                     }
                 }
                 else
@@ -446,9 +527,14 @@
             gvMx1.SetFocusedRowCellValue("qd002", SelectedDataRow["itemNo"]);
             gvMx1.SetFocusedRowCellValue("qd003", SelectedDataRow["itemName"]);
             gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
-            gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
+            gvMx1.SetFocusedRowCellValue("kcDw", SelectedDataRow["dwName"]);
+            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
         }
-
+        /// <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;
@@ -509,7 +595,46 @@
         {
             _toolCk(0);
         }
+        /// <summary>
+        /// 璐㈠姟瀹℃牳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnCaiWuChkClick(object sender, EventArgs e)
+        {
+            _toolCk(30);
+        }
+        /// <summary>
+        /// 璐㈠姟鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        /// <exception cref="NotImplementedException"></exception>
+        private void ToolBarMenu1_btnCaiWuFchkClick(object sender, EventArgs e)
+        {
+            _toolCk(31);
+        }
 
+        /// <summary>
+        /// 閲囪喘瀹℃牳
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnCaiGouChkClick(object sender, EventArgs e)
+        {
+            _toolCk(40);
+        }
+        /// <summary>
+        /// 閲囪喘鍙嶅鏍�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+
+        private void ToolBarMenu1_btnCaiGouFchkClick(object sender, EventArgs e)
+        {
+            _toolCk(41);
+        }
         /// <summary>
         /// 宸ュ叿鏉′簨浠�
         /// </summary>
@@ -525,6 +650,18 @@
                 case 0:
                     strMsg = "鍙嶅鏍�";
                     break;
+                      case 30:
+                    strMsg = "璐㈠姟瀹℃牳";
+                    break;
+                case 31:
+                    strMsg = "璐㈠姟鍙嶅鏍�";
+                    break;
+                case 40:
+                    strMsg = "閲囪喘瀹℃牳";
+                    break;
+                case 41:
+                    strMsg = "閲囪喘鍙嶅鏍�";
+                    break;
             };
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
@@ -537,7 +674,6 @@
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
                 return;
-
             var _obj = new
             {
                 guid = rowGuid,
@@ -550,76 +686,48 @@
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
-                if (_rtn.rtnCode > 0)
+                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                 {
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
+                    {
                         getModel(lbGuid.Text.Trim());
-                    else
-                        getPageList(1);
+                    }
+                    //int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
+                    //gridView1.FocusedRowHandle = rowHandle;
+                    //UtilityHelper.SetCheckIco(gridView1, "isSh", "qt016", "qt002", picCheckBox, this, _inFieldValue.ToString());
+
+                    //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
+                    getPageList(this.pageBar1.CurrentPage);
+                    int rowHandle = gridView1.LocateByValue("guid", rowGuid);
+                    gridView1.FocusedRowHandle = rowHandle;
                 }
             }
             catch (Exception ex)
             {
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
-
         }
-        
-        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
+        private void rptBl_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
         {
-            if (e.FocusedRowHandle >= 0)
-            {
-                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
-                lbMxGuid.Text = row["guid"].ToString();
-                ucBtnPrint1.guidKey = row["guid"].ToString();
-                txtWlid.Text = row["itemId"].ToString();
-                txtWlgg.Text = row["qd004"].ToString();
-                txtWlmc.Text = row["qd003"].ToString();
-                txtQuantity.Text = row["qd007"].ToString();//鐢宠鎬婚噺
-                txtYdy.Text = row["YDYNUM"].ToString();//宸叉墦鍗版�婚噺
-                kyPrtQty.Text = row["KDYNUM"].ToString();//鍙墦鍗版�婚噺
-            }
-        }
-        /// <summary>
-        /// 绉诲嚭鏉$爜
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            var rowhandle = gvMx2.FocusedRowHandle;
+            var rowhandle = gvMx1.FocusedRowHandle;
             if (rowhandle < 0)
                 return;
-            if (e.Button.Index == 0)
+            UcDictionarySelect frm = new UcDictionarySelect("寮傚父鎻忚堪", "  a.s_type='QC寮傚父鎻忚堪' and a.pid<>'00000000-0000-0000-0000-000000000000'");
+            frm.UpdateParent += (ss, ee) =>
             {
-                var dr = gvMx2.GetDataRow(rowhandle);
-                var mxGuid = dr["guid"].ToString();
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
-                    return;
-                var _obj = new
+                System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
+                var lst = ee.DynamicList;
+                foreach (dynamic dym in lst)
                 {
-                    mxGuid = mxGuid,
-                    inType = "dhtm"
-                };
-                try
-                {
-                    var strJson = UtilityHelper.HttpPost("",
-                        _webServiceName + "DeleteBarcode",
-                        JsonConvert.SerializeObject(_obj));
-                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0)
-                    {
-                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
-                    }
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    if (stringBuilder.Length > 0)
+                        stringBuilder.Append("|");
+                    stringBuilder.Append(dym.dicTxt);
                 }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
-            }
+                gvMx1.SetFocusedRowCellValue("qd012", stringBuilder.ToString());
+                // this.TextTxt = ;
+            };
+            frm.ShowDialog();
         }
-
-      
+        
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3