From fd94e95ef93cc6608e9c6ecfe8552d3f8dd9b880 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 17 八月 2025 22:53:49 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs |  420 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 286 insertions(+), 134 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index c1e7960..84cc074 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,4 +1,6 @@
 using DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.Rpt;
+using Gs.DevApp.DevFrm.Sales;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -16,7 +18,9 @@
     {
         string _webServiceName = "SalesReturnManager/";
         List<FilterEntity> _filterList = new List<FilterEntity>();
-        string _ucCk = "";//鍙戞枡浠撳簱
+        string _ucCk = "";//浠撳簱
+        string _ucKh = "";//瀹㈡埛
+        string _ucBm = "";//閮ㄩ棬
         public Frm_SalesReturnNotice()
         {
             InitializeComponent();
@@ -46,46 +50,12 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            // 璁剧疆閿�鍞崟
-            txt_salesOrderId.getSuppler("", "");
-            this.txt_salesOrderId.EditChanged += (s, e) =>
+            //鎵撳嵃浜嬩欢
+            this.ucBtnPrint1.btnPrintClick += (s, e) =>
             {
-                //鏈夋病鏈夐攢鍞鍗�
-                string _sqGuid = txt_salesOrderId.GetId();
-                if (string.IsNullOrEmpty(_sqGuid))
-                    return;
-                txt_custName.Text = txt_salesOrderId.GetSalesCusName();
-                txt_xsOrgName.Text = txt_salesOrderId.GetSalesOrgName();
-                string _xsOrgFid = txt_salesOrderId.GetSalesOrgFid();
-                txt_fstockid.getSuppler(_xsOrgFid, _ucCk);
-                System.Text.StringBuilder sbWhere = new System.Text.StringBuilder();
-                var _obj = new PageQueryModel(1, 999999, "item_no", "asc", "", sbWhere.ToString(), _sqGuid);
-                var json = JsonConvert.SerializeObject(_obj);
-                try
-                {
-                    var strReturn = UtilityHelper.HttpPost("",
-                        "SalesManager/SelectFormFhMx", json);
-                    var rtn = UtilityHelper.ReturnToTablePage(strReturn);
-                    var dt = rtn.rtnData.list;
-                    this.repositoryItemSearchLookUpEdit1.DataSource = dt;
-                    repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
-            };
-            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
-            this.ucBtnPrint1.btnDesignClick += (s, e) =>
-            {
-                ucBtnPrint1.rptParameter = "rpt_Xsth{}";
-            };
-            this.ucBtnPrint1.btnReportClick += (s, e) =>
-            {
-                ucBtnPrint1.guidKey = "";
                 string rowGuid = lbMxGuid.Text.Trim();
                 ucBtnPrint1.guidKey = rowGuid;
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim()))
+                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
                 {
                     Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑鏉$爜鏁伴噺锛�");
                     txt_iCount_1.Focus();
@@ -105,28 +75,193 @@
                     this.ucBtnPrint1.rptParameter = "return false";
                     return;
                 }
-                this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim()
+                this.ucBtnPrint1.rptParameter = "rpt_Xsth{"
+                       + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
                        + "," + ""
-                        + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
-                       + "," + txt_iCount_1.Text.Trim()
-                       + "," + txt_psnQty_1.Text.Trim()
+                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+                       + "," + txt_iCount_1.Text.Trim()//寮犳暟
+                       + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉$爜鏁伴噺
                        + "}";
+                txt_iCount_1.Text = "";
+                txt_psnQty_1.Text = "";
             };
-            //鑷姩璁$畻鎵撳嵃閲�
+            //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+            this.ucBtnPrint1.btnAllClick += (s, e) =>
+            {
+                string rowGuid = lbMxGuid.Text.Trim();
+                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, QcSeason.閿�鍞��璐у叆搴撴.ToString());
+                string strCodeList = "";
+                string strAction = "";
+                frm.UpdateParent += (ss, ee) =>
+                {
+                    strCodeList = ee.StringSingle;
+                    strAction = ee.Data;
+                };
+                frm.ShowDialog();
+                if (string.IsNullOrEmpty(strCodeList))
+                    return;
+                if (strAction == "print")
+                {
+                    try
+                    {
+                        string rptParameter = "rpt_Xsth{"
+                        + "100"//閲嶆墦閮芥槸浼�100锛�
+                        + "," + ""
+                        + "," + ""
+                        + "," + ""
+                        + "," + ""
+                        + "," + strCodeList
+                        + "}";
+                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
+                        {
+                            rpt.ShowDialog();
+                        }
+                        frm.Close();
+                    }
+                    catch (Exception ex)
+                    {
+                        MsgHelper.ShowError(ex.Message);
+                    }
+                }
+            };
+            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
+            //鎵撳嵃鑷姩璁$畻
             txt_psnQty_1.TextChanged += (s, e) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
             };
-
             radOut.SelectedIndexChanged += (s, e) =>
             {
                 Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
             };
+            //閿�鍞粍缁�
+            txt_salesOrg.EditChanged += (s, e) =>
+            {
+                var orgId = txt_salesOrg.GetId();
+                if (string.IsNullOrEmpty(orgId))
+                    return;
+                txt_fstockid.getSuppler(orgId, _ucCk);
+                txt_inventoryOrg.SetIdOrCode(orgId);
+                txt_salesDept.getSuppler(orgId,_ucBm);
+                txt_returnCustomer.getSuppler(orgId,_ucKh);
+            };
+            //閿�鍞儴闂�
+            txt_salesDept.EditChanged += (s, e) =>
+            {
+                var dptId = txt_salesDept.GetId();
+                if (string.IsNullOrEmpty(dptId))
+                    return;
+                txt_saleDeptName.Text=(txt_salesDept.GetName());
+            };
+            //閫夋嫨闇�瑕佺殑鏄庣粏
+            btnSelect.Click += (s, e) =>
+            {
+                if (string.IsNullOrEmpty(this.txt_salesOrg.GetId()))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨閿�鍞粍缁囷紒");
+                    return;
+                }
+                if (string.IsNullOrEmpty(this.txt_returnCustomer.GetId()))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨瀹㈡埛锛�");
+                    return;
+                }
+                if (txt_fHasLinkRad.SelectedIndex == 0)
+                {
+                    var frm = new Frm_SalesReturnNoticeSelect(this.txt_returnCustomer.GetId(), this.txt_salesOrg.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"] = dym.guid;
+                                _row["deliveDetailGuid"] = dym.deliveDetailGuid;//閫佽揣鏄庣粏guid
+                                _row["itemId"] = dym.itemId;
+                                _row["itemNo"] = dym.itemNo; //鐗╂枡缂栧彿,
+                                _row["itemName"] = dym.itemName;  //鐗╂枡鍚嶇О,
+                                _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
+                                _row["xxDw"] = dym.xxDw;
+                                _row["salesQuantity"] = dym.salesQuantity;
+                                _row["isFreeChk"] = dym.isFreeChk;
+                                _row["fhQuantity"] = dym.fhQuantity;
+                                gvMx1.UpdateCurrentRow();
+                                _Table.Rows.Add(_row);
+                            }
+                            gcMx1.BindingContext = new BindingContext();
+                            gcMx1.DataSource = _Table;
+                            gcMx1.ForceInitialize();
+                            gvMx1.CloseEditor();
+                            gvMx1.PostEditor();
+                            gvMx1.UpdateCurrentRow();
+                            gvMx1.BestFitColumns();
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(ex.Message);
+                        }
+                    };
+                    frm.ShowDialog();
+                    return;
+                }
+                if (txt_fHasLinkRad.SelectedIndex == 1)
+                {
+                    var frm2 = new Frm_SalesReturnNoticeSelectLink(this.txt_salesOrg.GetId());
+                    frm2.UpdateParent += (ss, ee) =>
+                    {
+                        try
+                        {
+                            var lst = ee.DynamicList;
+                            DataTable _Table = (DataTable)gcMx1.DataSource;
+                            foreach (dynamic dym in lst)
+                            {
+                                DataRow _row = _Table.NewRow();
+                                _row["guid"] = dym.guid;
+                                _row["deliveDetailGuid"] = dym.deliveDetailGuid;//閫佽揣鏄庣粏guid
+                                _row["itemId"] = dym.itemId;
+                                _row["itemNo"] = dym.itemNo; //鐗╂枡缂栧彿,
+                                _row["itemName"] = dym.itemName;  //鐗╂枡鍚嶇О,
+                                _row["itemModel"] = dym.itemModel;//瑙勬牸鍨嬪彿,
+                                _row["xxDw"] = dym.xxDw;
+                                _row["salesQuantity"] = dym.salesQuantity;
+                                _row["isFreeChk"]=dym.isFreeChk;
+                                _row["fhQuantity"] = dym.fhQuantity;
+                                gvMx1.UpdateCurrentRow();
+                                _Table.Rows.Add(_row);
+                            }
+                            gcMx1.BindingContext = new BindingContext();
+                            gcMx1.DataSource = _Table;
+                            gcMx1.ForceInitialize();
+                            gvMx1.CloseEditor();
+                            gvMx1.PostEditor();
+                            gvMx1.UpdateCurrentRow();
+                            gvMx1.BestFitColumns();
+                        }
+                        catch (Exception ex)
+                        {
+                            MessageBox.Show(ex.Message);
+                        }
+                    };
+                    frm2.ShowDialog();
+                    return;
+                }
+            };
+            //婧愬崟浜嬩欢
+            txt_fHasLinkRad.SelectedIndex = 0;
+            setSrm();
+            txt_fHasLinkRad.SelectedIndexChanged += (s, e) =>
+            {
+                setSrm();
+            };
         }
-
+      
         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);
         }
@@ -186,7 +321,7 @@
                 lbGuid, txt_billNo, gridView1, "billNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -204,18 +339,19 @@
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                 if (_rtn.rtnCode > 0)
                 {
+                    MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                     if (xtraTabControl1.SelectedTabPageIndex == 0)
                     { }
                     else
                         Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                     getPageList(this.pageBar1.CurrentPage);
                 }
-
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                else
+                    MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
 
         }
@@ -253,7 +389,7 @@
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billno");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -268,6 +404,11 @@
                 gvList.Add(gvMx2);
                 UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
             }
+            //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+            setSrm();
+            txt_salesOrg.IsReadly = true;
+            txt_inventoryOrg.IsReadly = true;
+            txt_fHasLinkRad.ReadOnly = true;
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -284,7 +425,10 @@
             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_salesOrg);
+            string deftXqOrg = UtilityHelper.GetFirstOrg(txt_inventoryOrg);
+            setSrm();
         }
         /// <summary>
         /// 淇濆瓨浜嬩欢
@@ -294,37 +438,75 @@
         private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
         {
             toolBarMenu1.isSetBtn = false;
-            string djlx = txt_billType.Text.ToString();
-            string FNote = txt_returnReason.Text.ToString();
-            string _sqGuid = txt_salesOrderId.GetId();
-            string ckId = txt_fstockid.GetId();
-            int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
-            if (string.IsNullOrEmpty(_sqGuid))
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒");
-                txt_salesOrderId.Focus();
-                return;
-            }
+            string _djlx = txt_billType.Text.ToString();
+            string _FNote = txt_returnReason.Text.ToString();
+            string _ckId = txt_fstockid.GetId();
+            int _FIsLink = txt_fHasLinkRad.SelectedIndex;
+            //涓嬮潰鏄棤婧愬崟鐢ㄥ埌鐨�
+            string _salesOrg = txt_salesOrg.GetId();
+            string _inventoryOrg = txt_inventoryOrg.GetId();
+            string _returnCustomer = txt_returnCustomer.GetId().ToString();
+            string _salesDept = txt_salesDept.GetId();
             if (txt_billType.SelectedIndex < 0)
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
                 txt_billType.Focus();
                 return;
             }
-            if (string.IsNullOrEmpty(ckId))
+            if (_FIsLink < 0)
             {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨婧愬崟绫诲瀷锛�");
+                txt_fHasLinkRad.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_salesOrg))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞粍缁囷紒");
+                txt_salesOrg.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_returnCustomer))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨瀹㈡埛锛�");
+                txt_returnCustomer.Focus();
+                return;
+            }
+            if (string.IsNullOrEmpty(_ckId))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
                 txt_fstockid.Focus();
                 return;
+            }
+            //杩欐棤婧愮被鍨嬬殑妫�楠宐eg
+             if (_FIsLink == 1)
+            {
+              
+                if (string.IsNullOrEmpty(_inventoryOrg))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨瀛樼粍缁囷紒");
+                    txt_inventoryOrg.Focus();
+                    return;
+                }
+              
+                if (string.IsNullOrEmpty(_salesDept))
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閮ㄩ棬锛�");
+                    txt_salesDept.Focus();
+                    return;
+                }
             }
             var _obj = new
             {
                 guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
-                djlx = djlx,//鍗曟嵁绫诲瀷
-                salesId = _sqGuid,//閿�鍞崟鍙�
-                inRemark = FNote.Trim(),//澶囨敞
-                ckId = ckId,
-                FIsLink = _fIsLink,//鏈夋棤婧愬崟
+                djlx = _djlx,//鍗曟嵁绫诲瀷
+                inRemark = _FNote.Trim(),//澶囨敞
+                ckId = _ckId,
+                FIsLink = txt_fHasLinkRad.SelectedIndex,
+                //涓嬮潰鏄棤婧愮殑
+                salesOrg = _salesOrg,
+                inventoryOrg = _inventoryOrg,
+                returnCustomer = _returnCustomer,
+                salesDept = _salesDept,
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -367,6 +549,7 @@
                         Bz = (row["note"].ToString()),
                         Thlx = (row["returnType"].ToString()),
                         Thrq = (row["returnDate"].ToString()),
+                        ItemId = (row["ItemId"].ToString()),
                     });
                 }
             }
@@ -374,9 +557,9 @@
             {
                 string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                 ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
                 if (_rtn.rtnCode > 0)
                 {
+                    ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
                     lbGuid.Text = _rtn.rtnData.outGuid;
                     txt_billNo.Text = _rtn.rtnData.outNo;
                     toolBarMenu1.isSetBtn = true;
@@ -387,10 +570,12 @@
                     toolBarMenu1.currentAction = "";
                     Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                 }
+                else
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
         /// <summary>
@@ -521,11 +706,11 @@
                     }
                 }
                 else
-                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
 
@@ -566,13 +751,14 @@
                 case 0:
                     strMsg = "鍙嶅鏍�";
                     break;
-            };
+            }
+            ;
             toolBarMenu1.guidKey = "";
             string rowGuid, rowName;
             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
                 return;
             }
             if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -588,9 +774,9 @@
                     _webServiceName + "EditModelSubmit",
                     JsonConvert.SerializeObject(_obj));
                 var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                 if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                 {
+                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                     if (xtraTabControl1.SelectedTabPageIndex == 1)
                     {
                         getModel(lbGuid.Text.Trim());
@@ -599,27 +785,15 @@
                     gridView1.FocusedRowHandle = rowHandle;
                     UtilityHelper.SetCheckIco(gridView1, "chkStatus", "approvedBy", "approvedDate", picCheckBox, this, _inFieldValue.ToString());
                 }
+                else
+                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
             }
             catch (Exception ex)
             {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
-        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("itemModel", SelectedDataRow["itemModel"].ToString());
-            gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["itemId"].ToString());
-            //gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
-            gvMx1.SetFocusedRowCellValue("salesQuantity", SelectedDataRow["fhSl"].ToString());
-            gvMx1.SetFocusedRowCellValue("deliveDetailGuid", SelectedDataRow["ckmxGuid"].ToString());
-            gvMx1.CloseEditor();
-            gvMx1.PostEditor();
-            gvMx1.UpdateCurrentRow();
-        }
+       
         /// <summary>
         /// 绉诲嚭鏄庣粏
         /// </summary>
@@ -654,13 +828,15 @@
                     var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                     if (_rtn.rtnCode > 0)
                     {
-                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+                        MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+                        getModel(lbGuid.Text);
                     }
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    else
+                        MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
                 }
                 catch (Exception ex)
                 {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+                    MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
                 }
             }
         }
@@ -694,45 +870,21 @@
             }
         }
 
-        /// <summary>
-        /// 閲嶆墦
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+
+        private void setSrm()
         {
-            MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
-            return;
-            var rowhandle = gvMx2.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
+            int ddd = txt_fHasLinkRad.SelectedIndex;
+            if (ddd == 0)
             {
-                var dr = gvMx2.GetDataRow(rowhandle);
-                var mxGuid = dr["guid"].ToString();
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
-                    return;
-                var _obj = new
-                {
-                    mxGuid = mxGuid,
-                    inType = "dhtm"
-                };
-                try
-                {
-                    var strJson = UtilityHelper.HttpPost("",
-                        "VArrivalBarcodeManager/DeleteBarcode",
-                        JsonConvert.SerializeObject(_obj));
-                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0)
-                    {
-                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
-                    }
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
+                layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            }
+            else
+            {
+                layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+
+               
             }
         }
     }

--
Gitblit v1.9.3