From e7911963a915caf930b3551b4ace54e78d12c05a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 10 八月 2025 07:08:23 +0800
Subject: [PATCH] 销售

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs |  111 +++++++++++++++++++++++++++----------------------------
 1 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 2e25275..d7122f1 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -1,4 +1,5 @@
 using DevExpress.XtraEditors;
+using Gs.DevApp.DevFrm.Rpt;
 using Gs.DevApp.Entity;
 using Gs.DevApp.ToolBox;
 using Gs.DevApp.UserControl;
@@ -75,12 +76,8 @@
                     MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
                 }
             };
-            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
-            this.ucBtnPrint1.btnDesignClick += (s, e) =>
-            {
-                ucBtnPrint1.rptParameter = "rpt_Xsth{}";
-            };
-            this.ucBtnPrint1.btnReportClick += (s, e) =>
+            //鎵撳嵃浜嬩欢
+            this.ucBtnPrint1.btnPrintClick += (s, e) =>
             {
                 ucBtnPrint1.guidKey = "";
                 string rowGuid = lbMxGuid.Text.Trim();
@@ -99,25 +96,65 @@
                     this.ucBtnPrint1.rptParameter = "return false";
                     return;
                 }
-                if (lbMxGuid.Text.Trim().Length < 10)
+                if (rowGuid.Length < 10)
                 {
                     Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
                     this.ucBtnPrint1.rptParameter = "return false";
                     return;
                 }
-                this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim()
+
+                this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + rowGuid.Trim()
                        + "," + ""
-                        + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
                        + "," + txt_iCount_1.Text.Trim()
                        + "," + txt_psnQty_1.Text.Trim()
                        + "}";
             };
+            //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
+            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"
+                        + "," + ""
+                        + "," + ""
+                        + "," + ""
+                        + "," + ""
+                        + "," + 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);
+              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);
@@ -298,7 +335,7 @@
             string FNote = txt_returnReason.Text.ToString();
             string _sqGuid = txt_salesOrderId.GetId();
             string ckId = txt_fstockid.GetId();
-            int _fIsLink = txt_fIsLink.SelectedIndex == 0 ? 1 : 0;
+            int _fIsLink = txt_fHasLinkRad.SelectedIndex;
             if (string.IsNullOrEmpty(_sqGuid))
             {
                 Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒");
@@ -374,9 +411,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 +424,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>
@@ -671,6 +710,8 @@
             {
                 DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
                 lbMxGuid.Text = row["guid"].ToString();
+                if (string.IsNullOrEmpty(lbMxGuid.Text))
+                    return;
                 ucBtnPrint1.guidKey = row["guid"].ToString();
                 txtWlid.Text = row["itemNo"].ToString();
                 txtWlgg.Text = row["itemModel"].ToString();
@@ -691,48 +732,6 @@
                 txt_kQty.Text = "";
                 txt_psnQty_1.Text = "";
                 txt_iCount_1.Text = "";
-            }
-        }
-
-        /// <summary>
-        /// 閲嶆墦
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void repositoryItemButtonEdit2_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            MsgHelper.ShowInformation("鍔熻兘寮�鍙戜腑锛�");
-            return;
-            var rowhandle = gvMx2.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 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);
-                }
             }
         }
     }

--
Gitblit v1.9.3