From 70c49ce94352ea6097b5de48536e81b1b96682e5 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 13 十月 2025 21:29:26 +0800
Subject: [PATCH] 打印

---
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs |  255 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 166 insertions(+), 89 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index 84cc074..0601e7b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -50,40 +50,11 @@
             }, lbGuid);
             getPageList(1);
             pageBar1.PagerEvent += PageBar1_PagerEvent;
-            //鎵撳嵃浜嬩欢
+            #region 鎵撳嵃鐩稿叧
+            //棰勮鎵撳嵃浜嬩欢
             this.ucBtnPrint1.btnPrintClick += (s, e) =>
             {
-                string rowGuid = lbMxGuid.Text.Trim();
-                ucBtnPrint1.guidKey = rowGuid;
-                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();
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
-                    txt_psnQty_1.Focus();
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                if (lbMxGuid.Text.Trim().Length < 10)
-                {
-                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
-                    this.ucBtnPrint1.rptParameter = "return false";
-                    return;
-                }
-                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()//姣忓紶鏉$爜鏁伴噺
-                       + "}";
-                txt_iCount_1.Text = "";
-                txt_psnQty_1.Text = "";
+                _print(0);
             };
             //鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
             this.ucBtnPrint1.btnAllClick += (s, e) =>
@@ -124,6 +95,11 @@
                     }
                 }
             };
+            //鐩存帴鎵撳嵃浜嬩欢
+            this.ucBtnPrint1.btnZhiJieClick += (s, e) =>
+            {
+                _print(1);
+            };
             gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
             //鎵撳嵃鑷姩璁$畻
             txt_psnQty_1.TextChanged += (s, e) =>
@@ -134,6 +110,8 @@
             {
                 Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
             };
+            #endregion
+
             //閿�鍞粍缁�
             txt_salesOrg.EditChanged += (s, e) =>
             {
@@ -142,8 +120,8 @@
                     return;
                 txt_fstockid.getSuppler(orgId, _ucCk);
                 txt_inventoryOrg.SetIdOrCode(orgId);
-                txt_salesDept.getSuppler(orgId,_ucBm);
-                txt_returnCustomer.getSuppler(orgId,_ucKh);
+                txt_salesDept.getSuppler(orgId, _ucBm);
+                txt_returnCustomer.getSuppler(orgId, _ucKh);
             };
             //閿�鍞儴闂�
             txt_salesDept.EditChanged += (s, e) =>
@@ -151,7 +129,7 @@
                 var dptId = txt_salesDept.GetId();
                 if (string.IsNullOrEmpty(dptId))
                     return;
-                txt_saleDeptName.Text=(txt_salesDept.GetName());
+                txt_saleDeptName.Text = (txt_salesDept.GetName());
             };
             //閫夋嫨闇�瑕佺殑鏄庣粏
             btnSelect.Click += (s, e) =>
@@ -168,9 +146,97 @@
                 }
                 if (txt_fHasLinkRad.SelectedIndex == 0)
                 {
-                    var frm = new Frm_SalesReturnNoticeSelect(this.txt_returnCustomer.GetId(), this.txt_salesOrg.GetId());
-                    //璧嬪�肩粰鏄庣粏琛�
-                    frm.UpdateParent += (ss, ee) =>
+                    //鏈夋簮鍗曚箣閿�鍞嚭搴撳崟
+                    if (txt_fHasLinkSource.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;
+                    }
+                    //鏈夋簮鍗曚箣閿�鍞崟
+                    else
+                    {
+                        var frm = new Frm_SalesReturnNoticeSelect2(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
                         {
@@ -205,47 +271,6 @@
                             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;
                 }
@@ -258,7 +283,44 @@
                 setSrm();
             };
         }
-      
+        /// <summary>
+        /// 鎵撳嵃
+        /// </summary>
+        /// <param name="type">0琛ㄧず棰勮鎵撳嵃锛�1琛ㄧず鐩存帴鎵撳嵃</param>
+        private void _print(int type)
+        {
+            string rowGuid = lbMxGuid.Text.Trim();
+            ucBtnPrint1.guidKey = rowGuid;
+            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();
+                this.ucBtnPrint1.rptParameter = "return false";
+                return;
+            }
+            if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鏉$爜鏁伴噺锛�");
+                txt_psnQty_1.Focus();
+                this.ucBtnPrint1.rptParameter = "return false";
+                return;
+            }
+            if (lbMxGuid.Text.Trim().Length < 10)
+            {
+                Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
+                this.ucBtnPrint1.rptParameter = "return false";
+                return;
+            }
+            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()//姣忓紶鏉$爜鏁伴噺
+                   + "}";
+            txt_iCount_1.Text = "";
+            txt_psnQty_1.Text = "";
+        }
         private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
         {
             _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -409,6 +471,8 @@
             txt_salesOrg.IsReadly = true;
             txt_inventoryOrg.IsReadly = true;
             txt_fHasLinkRad.ReadOnly = true;
+            txt_fHasLinkSource.ReadOnly = true;
+            txt_returnCustomer.IsReadly = true;
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -447,6 +511,7 @@
             string _inventoryOrg = txt_inventoryOrg.GetId();
             string _returnCustomer = txt_returnCustomer.GetId().ToString();
             string _salesDept = txt_salesDept.GetId();
+            string _xsms = txt_xsms.Text.ToString();
             if (txt_billType.SelectedIndex < 0)
             {
                 Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
@@ -478,20 +543,24 @@
                 return;
             }
             //杩欐棤婧愮被鍨嬬殑妫�楠宐eg
-             if (_FIsLink == 1)
+            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;
+                }
+                if (txt_xsms.SelectedIndex <= 0)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞ā寮忥紒");
+                    txt_xsms.Focus();
                     return;
                 }
             }
@@ -501,12 +570,14 @@
                 djlx = _djlx,//鍗曟嵁绫诲瀷
                 inRemark = _FNote.Trim(),//澶囨敞
                 ckId = _ckId,
-                FIsLink = txt_fHasLinkRad.SelectedIndex,
+                fIsLink = txt_fHasLinkRad.SelectedIndex,
+                fHasLinkSource = txt_fHasLinkSource.Text.Trim(),
                 //涓嬮潰鏄棤婧愮殑
                 salesOrg = _salesOrg,
                 inventoryOrg = _inventoryOrg,
                 returnCustomer = _returnCustomer,
                 salesDept = _salesDept,
+                xsms = _xsms,
                 list = new List<dynamic>(),
             };
             gvMx1.CloseEditor();
@@ -598,7 +669,11 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null;
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            _sbSqlWhere.Append(" and xs.FID in");
+            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
             PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
             string json = JsonConvert.SerializeObject(pgq);
             try
@@ -793,7 +868,7 @@
                 MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
         }
-       
+
         /// <summary>
         /// 绉诲嚭鏄庣粏
         /// </summary>
@@ -807,7 +882,7 @@
             if (e.Button.Index == 0)
             {
                 var dr = gvMx1.GetDataRow(rowhandle);
-                var mxGuid = dr["id"].ToString();
+                var mxGuid = dr["guid"].ToString();
                 if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
                     return;
                 if (string.IsNullOrEmpty(mxGuid))
@@ -878,13 +953,15 @@
             {
                 layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                 layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+                layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
+                layItem101.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             }
             else
             {
                 layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                 layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
-
-               
+                layItem100.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+                layItem101.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
             }
         }
     }

--
Gitblit v1.9.3