From a55730702b0b1b541d6ec40cac4469a2418936d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 20 十二月 2024 18:50:24 +0800
Subject: [PATCH] 工单打印

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs |  437 +++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 301 insertions(+), 136 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 55cbb39..234d055 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -1,18 +1,14 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Drawing;
-using System.Security.Cryptography;
-using System.Text;
+using System.Threading.Tasks;
 using System.Windows.Forms;
-using DevExpress.DataAccess.DataFederation;
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
 using DevExpress.XtraGrid.Views.Grid;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
-using MES.Service.Modes;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -22,14 +18,10 @@
     {
         private List<FilterEntity> _filterList = new List<FilterEntity>();
         private readonly string _webServiceName = "MesInvItemArnManager/";
-
         public Frm_MesInvItemArn()
         {
             InitializeComponent();
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            this.gridView1.ColumnPanelRowHeight = 60;
-            this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
-            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
             toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
             toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -39,85 +31,78 @@
             toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
             toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
             toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
-            gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
-            getPageList(1, UtilityHelper.GetPageSize());
-            gridView1.CustomDrawRowIndicator += (s, e) =>
+            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+            
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1);
+            getPageList(1);
+            pageBar1.PagerEvent += PageBar1_PagerEvent;
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
+            //璁剧疆缁勭粐
+            this.txt_receiveOrgId.EditChanged += (s, e) =>
             {
-                if (e.Info.IsRowIndicator && e.RowHandle >= 0)
-                    e.Info.DisplayText = (e.RowHandle + 1).ToString();
+                string _orgId = txt_receiveOrgId.GetId();
+                txt_suppId.getSuppler(_orgId);
+                txt_depotsId.getSuppler(_orgId);
             };
-            gridView1.CustomDrawEmptyForeground += (s, e) =>
+            //璁剧疆浠撳簱閫夋嫨
+            this.txt_depotsId.EditChanged += (s, e) =>
             {
-                var str = "鏆傛湭鏌ユ壘鍒板尮閰嶇殑鏁版嵁!";
-                var f = new Font("寰蒋闆呴粦", 16);
-                var r = new Rectangle(gridView1.GridControl.Width / 2 - 100,
-                    e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
-                e.Graphics.DrawString(str, f, Brushes.Gray, r);
+                txtDepotsCode.Text = this.txt_depotsId.GetCode();
             };
-            this.txt_depotsCode.KeyFile = "depotCode";
-            this.txt_suppNo.KeyFile = "suppNo";
+            //璁剧疆渚涘簲鍟嗛�夋嫨
+            this.txt_suppId.EditChanged += (s, e) =>
+            {
+                txtSupplierCode.Text = this.txt_suppId.GetCode();
+            };
+            //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
             btnSelect.Click += (s, e) =>
             {
-                var frm = new SelectCgMx();
+                if (string.IsNullOrEmpty(this.txt_suppId.GetId()))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
+                    return;
+                }
+                var frm = new SelectCgMx(this.txt_suppId.GetId());
+                //璧嬪�肩粰鏄庣粏琛�
                 frm.UpdateParent += (ss, ee) =>
                 {
-                    var lst = new List<string>();
-                    lst = ee.StringList;
-                    var _obj = lst;
-                    var strReturn = UtilityHelper.HttpPost("",
-                        "MesInvItemArnDetailManager/GetListPageByCgmxGuid",
-                        JsonConvert.SerializeObject(_obj));
-                    var dt = UtilityHelper.ReturnToList(strReturn);
-                    DataTable _newTable = dt.rtnData;
-                    DataTable _oldTable = (DataTable)gcMx1.DataSource;
-                    DataRow[] sourceRows = _newTable.Select();
-                    for (int i = 0; i < sourceRows.Length; i++)
+                    try
                     {
-                        _oldTable.ImportRow(sourceRows[i]);
+                        var lst = new List<string>();
+                        lst = ee.StringList;
+                        var _obj = lst;
+                        var strReturn = UtilityHelper.HttpPost("",
+                            _webServiceName + "SelectDialogToView",
+                            JsonConvert.SerializeObject(_obj));
+                        var dt = UtilityHelper.ReturnToList(strReturn);
+                        DataTable _newTable = dt.rtnData;
+                        DataTable _oldTable = (DataTable)gcMx1.DataSource;
+                        DataRow[] sourceRows = _newTable.Select();
+                        for (int i = 0; i < sourceRows.Length; i++)
+                        {
+                            _oldTable.ImportRow(sourceRows[i]);
+                        }
+                        gcMx1.BindingContext = new BindingContext();
+                        gcMx1.DataSource = _oldTable;
+                        gcMx1.ForceInitialize();
                     }
-                    gcMx1.BindingContext = new BindingContext();
-                    gcMx1.DataSource = _oldTable;
-                    gcMx1.ForceInitialize();
+                    catch (Exception ex)
+                    {
+
+                        MessageBox.Show(ex.Message);
+                    }
+
                 };
                 frm.ShowDialog();
             };
         }
 
-        private void ToolBarMenu1_btnFjianYanClick1(object sender, EventArgs e)
+        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
-            throw new NotImplementedException();
+            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns);
+            Task.Delay(100);
+            getPageList(1);
         }
-
-        /// <summary>
-        ///     鍙嶆楠�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-        }
-
-        /// <summary>
-        ///     妫�楠�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_billNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
-        }
-
         /// <summary>
         ///     鍙屽嚮浜嬩欢
         /// </summary>
@@ -138,7 +123,7 @@
         /// <param name="pageSize"></param>
         private void PageBar1_PagerEvent(int curPage, int pageSize)
         {
-            getPageList(curPage, pageSize);
+            getPageList(curPage);
         }
 
         /// <summary>
@@ -148,6 +133,9 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
         {
+            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+            gridView1.ActiveFilter.Clear();
+            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
             var frm = new ShowFilter(gridView1.Columns, _filterList);
             frm.UpdateParent += Frm_UpdateParent;
             frm.ShowDialog();
@@ -161,9 +149,111 @@
         private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
         {
             _filterList = e.FilterList;
-            getPageList(1, pageBar1.RowsCount);
+            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_billNo, gridView1);
+            toolBarMenu1.guidKey = rowGuid;
         }
 
+        /// <summary>
+        ///  鍙嶆楠�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnFjianYanClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_billNo, gridView1, "billNo");
+            toolBarMenu1.guidKey = rowGuid;
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎾ゅ洖宸叉彁浜ょ殑妫�楠屽悧锛�"))
+                return;
+
+            var _obj = new
+            {
+                guid = rowGuid,
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "EditModelSubmitF",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                        getModel(lbGuid.Text.Trim(), false, 999);
+                    else
+                        getPageList(1);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+
+        }
+
+        /// <summary>
+        /// 妫�楠�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
+        {
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+                lbGuid, txt_billNo, gridView1, "billNo");
+            toolBarMenu1.guidKey = rowGuid;
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鎻愪氦妫�楠屽悧锛�"))
+                return;
+            var _obj = new
+            {
+                guid = rowGuid,
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("",
+                    _webServiceName + "EditModelSubmit",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                        getModel(lbGuid.Text.Trim(), false, 999);
+                    else
+                        getPageList(1);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
         /// <summary>
         ///     鍙栨秷浜嬩欢
         /// </summary>
@@ -189,24 +279,24 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
                 return;
-            var lst = new List<dynamic>();
-            lst.Add(rowGuid);
-            var _obj = lst;
+            var _obj = new
+            {
+                guid = rowGuid,
+                mxGuid = Guid.Empty.ToString(),
+            };
             try
             {
                 var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "DeleteModel",
+                    _webServiceName + "DeleteModelOrMx",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
                     UtilityHelper.JumpToTab(xtraTabControl1, 0);
-                    getPageList(1, UtilityHelper.GetPageSize());
+                    getPageList(1);
                 }
-
                 MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
@@ -222,8 +312,19 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
         {
-            UtilityHelper.JumpToTab(xtraTabControl1, 0);
-            getPageList(1, UtilityHelper.GetPageSize());
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+                getModel(lbGuid.Text.Trim(), false, 999);
+            else
+            {
+                _filterList.Clear();
+                if (gridView1.ActiveFilter.Count > 0)
+                {
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    gridView1.ActiveFilter.Clear();
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                }
+                getPageList(1);
+            }
         }
 
         /// <summary>
@@ -268,38 +369,38 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            var _ckCode = txt_depotsCode.GetCode(); //浠撳簱缂栧彿 depots_code
-            var _gysCode = txt_suppNo.GetCode(); //渚涘簲鍟嗙紪鍙�
-            if (string.IsNullOrEmpty(_ckCode))
+            string _orgId = txt_receiveOrgId.GetId();
+            string _ckId = txt_depotsId.GetId(); //浠撳簱缂栧彿 depots_code
+            string _gysId = txt_suppId.GetId(); //渚涘簲鍟嗙紪鍙�
+            if (string.IsNullOrEmpty(_orgId))
             {
-                MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
-                txt_depotsCode.Focus();
+                MsgHelper.Warning("璇烽�夋嫨鏀舵枡缁勭粐锛�");
+                txt_receiveOrgId.Focus();
                 return;
             }
-
-            if (string.IsNullOrEmpty(_gysCode))
+            if (string.IsNullOrEmpty(_gysId))
             {
                 MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
-                txt_suppNo.Focus();
+                txt_suppId.Focus();
                 return;
             }
-
-            if (string.IsNullOrEmpty(txt_paperBillNo.Text.Trim()))
+            if (string.IsNullOrEmpty(_ckId))
             {
-                MsgHelper.Warning("璇烽�夋嫨閫佽揣鍗曞彿锛�");
-                txt_paperBillNo.Focus();
+                MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+                txt_depotsId.Focus();
                 return;
             }
-
-            var _obj = new MesInvItemArn();
-            _obj.Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()); //鍒拌揣鍗曚富閿�
-            _obj.PaperBillNo = txt_paperBillNo.Text.Trim(); //閫佽揣鍗曞彿;
-            _obj.Remark = ""; //澶囨敞
-            _obj.SuppNo = _gysCode; //渚涘簲鍟嗙紪鍙�
-            _obj.DepotsCode = _ckCode; //浠撳簱缂栧彿 depots_code
-            _obj.FType = txt_fType.Checked; //0=閲囪喘锛�1=濮斿
-            _obj.UrgentFlag = txt_urgentFlag.Checked;//0=涓嶆�ワ紝1=鎬�
-            _obj.list = new List<MesInvItemArnDetail>();
+            var _obj = new
+            {
+                Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()), //鍒拌揣鍗曚富閿�
+                PaperBillNo = txt_paperBillNo.Text.Trim(), //閫佽揣鍗曞彿;
+                Remark = txt_remark.Text.Trim(), //澶囨敞
+                SuppId = _gysId, //渚涘簲鍟�
+                DepotsId = _ckId,//浠撳簱
+                FType = txt_fType.Checked ? 1 : 0,//0=閲囪喘锛�1=濮斿
+                OrgId = _orgId,
+                list = new List<dynamic>(),
+            };
             gvMx1.CloseEditor();
             gvMx1.UpdateCurrentRow();
             if (gvMx1.DataRowCount <= 0)
@@ -319,17 +420,16 @@
                         MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
                         return;
                     }
-                    _obj.list.Add(new MesInvItemArnDetail
+                    _obj.list.Add(new
                     {
                         Guid = _guid,
-                        AboutGuid = Guid.Parse(row["aboutGuid"].ToString()),
-                        ItemNo = row["itemNo"].ToString(),
-                        //ItemId= int.Parse( row["itemId"].ToString()),
-                        Quantity = decimal.Parse(row["quantity"].ToString())
+                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
+                        ItemId = int.Parse(row["itemId"].ToString()),
+                        Quantity = decimal.Parse(row["quantity"].ToString()),
+                        UrgentFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBit(row["urgentFlag"].ToString()),
                     });
                 }
             }
-
             try
             {
                 var strJson = UtilityHelper.HttpPost("",
@@ -354,13 +454,10 @@
         /// </summary>
         /// <param name="curPage">绗嚑椤�</param>
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage, int pageSize)
+        private void getPageList(int curPage)
         {
-            var _sbSqlWhere = new StringBuilder();
-            foreach (var itm in _filterList)
-                _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
-                                   itm.fileValue + "'");
-            var pgq = new PageQueryModel(curPage, pageSize, "create_date",
+            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date",
                 "asc", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try
@@ -368,16 +465,27 @@
                 var strReturn = UtilityHelper.HttpPost("",
                     _webServiceName + "GetListPage", json);
                 var dd = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = dd.rtnData.list;
-                gcMain.BindingContext = new BindingContext();
-                gcMain.DataSource = dt;
-                gcMain.ForceInitialize();
-                var dddd = dd.rtnData.pages; //鎬婚〉
-                pageBar1.TotalPages = dddd;
-                pageBar1.RecordCount = dd.rtnData.total; //璁板綍鎬绘暟
-                pageBar1.CurrentPage = curPage; //褰撳墠椤�
-                pageBar1.RowsCount = pageSize; //姣忛〉鏄剧ず
-                pageBar1.setTxt();
+                if (dd.rtnCode > 0)
+                {
+                    DataTable dt = dd.rtnData.list;
+                    gcMain.BindingContext = new BindingContext();
+                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
+                    if (dt.Rows.Count > 0)
+                    {
+                        gcMain.DataSource = dt;
+                        gcMain.ForceInitialize();
+                    }
+                    else
+                        UtilityHelper.SetDefaultTable(gcMain, gridView1);
+                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
+                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
+                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
+                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
+                }
+                else
+                {
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
+                }
             }
             catch (Exception ex)
             {
@@ -392,7 +500,6 @@
                 MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
-
             UtilityHelper.JumpToTab(xtraTabControl1, tabIdx);
             var _obj = new
             {
@@ -410,8 +517,7 @@
                     lbGuid.Text = strGuid;
                     var gvList = new List<GridView>();
                     gvList.Add(gvMx1);
-                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit,
-                        gvList);
+                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList);
                     var _job = JObject.Parse(strJson);
                     var array = new JArray();
                     foreach (var a in _job["rtnData"]["list"]) array.Add(a);
@@ -440,6 +546,11 @@
             }
         }
 
+        /// <summary>
+        /// 鏄庣粏鍒犻櫎
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
         private void repositoryItemButtonEdit1_ButtonClick(object sender,
             ButtonPressedEventArgs e)
         {
@@ -452,16 +563,26 @@
                 var mxGuid = dr["guid"].ToString();
                 if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
                     return;
-                var strJson = "";
-                var lst = new List<string>();
-                lst.Add(mxGuid);
+                if (string.IsNullOrEmpty(mxGuid))
+                {
+                    gvMx1.DeleteRow(rowhandle);
+                    return;
+                }
+                var _obj = new
+                {
+                    guid = lbGuid.Text.Trim(),
+                    mxGuid = mxGuid,
+                };
                 try
                 {
-                    strJson = UtilityHelper.HttpPost("",
-                        _webServiceName + "DeleteModelMx",
-                        JsonConvert.SerializeObject(lst));
+                    var strJson = UtilityHelper.HttpPost("",
+                        _webServiceName + "DeleteModelOrMx",
+                        JsonConvert.SerializeObject(_obj));
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
+                    }
                     MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
@@ -470,5 +591,49 @@
                 }
             }
         }
+        /// <summary>
+        /// 鏄庣粏閫�璐�
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void repositoryItemButtonEdit2_ButtonClick(object sender, ButtonPressedEventArgs e)
+        {
+            var rowhandle = gvMx1.FocusedRowHandle;
+            if (rowhandle < 0)
+                return;
+            if (e.Button.Index == 0)
+            {
+                var dr = gvMx1.GetDataRow(rowhandle);
+                var mxGuid = dr["guid"].ToString();
+                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾閫�璐у悧锛�"))
+                    return;
+                if (string.IsNullOrEmpty(mxGuid))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("鏆傛湭淇濆瓨锛屼笉鑳介��璐э紒");
+                    return;
+                }
+                var lst = new List<string>();
+                lst.Add(mxGuid);
+
+                var _obj = lst;
+                try
+                {
+                    var strJson = UtilityHelper.HttpPost("",
+                        _webServiceName + "TuiMx",
+                        JsonConvert.SerializeObject(_obj));
+                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                    if (_rtn.rtnCode > 0)
+                    {
+
+                    }
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+                }
+                catch (Exception ex)
+                {
+                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                }
+
+            }
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3