From fa5de165763861932e78e0aaa458c7b65b75008d Mon Sep 17 00:00:00 2001
From: wyf <wyf@local>
Date: Thu, 5 Jun 2025 09:30:16 +0000
Subject: [PATCH] SVN r674

SVN-Revision: r674
---
 插件库/Lskj.PubBill/BillModule.cs | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/插件库/Lskj.PubBill/BillModule.cs b/插件库/Lskj.PubBill/BillModule.cs
index 5b2c1a2..61bb403 100644
--- a/插件库/Lskj.PubBill/BillModule.cs
+++ b/插件库/Lskj.PubBill/BillModule.cs
@@ -982,6 +982,17 @@ namespace Lskj.PubBill
                         }
                     }
                 }
+                foreach (XtraTabPage xtraTabPage in this.tb_buttom.TabControlObj.TabPages)
+                {
+                    if (xtraTabPage.Tag != null && (xtraTabPage.Tag != null && xtraTabPage.Tag is System.Windows.Forms.Control pageControl) && pageControl.Tag != null)
+                    {
+                        if (pageControl.Tag is GridDetailModel detailModel && (detailModel.Orderid + "").Equals("-9999"))
+                        {
+                            this.tb_buttom.TabControlObj.SelectedTabPage = xtraTabPage;
+                            break;
+                        }
+                    }
+                }
                 CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, this.gcMain);
                 menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
                 menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
@@ -2769,12 +2780,12 @@ namespace Lskj.PubBill
                 {
                     if (e.DialogModel.ReturnTag != null && e.DialogModel.ReturnTag is BomImpRtnModel impRtnModel)
                     {
-                        if (impRtnModel.ShowType.Equals("1") || impRtnModel.ShowType.Equals("2") || impRtnModel.ShowType.Equals("3") || impRtnModel.ShowType.Equals("5") || impRtnModel.ShowType.Equals("6"))//执行保存
+                        if (impRtnModel.ShowType.Equals("1") || impRtnModel.ShowType.Equals("2") || impRtnModel.ShowType.Equals("3") || impRtnModel.ShowType.Equals("5") || impRtnModel.ShowType.Equals("6") || impRtnModel.ShowType.Equals("7"))//执行保存
                         {
                             CommonMenu menu = (CommonMenu)sender;
                             menu.issuccess = impRtnModel.CanSave;
                         }
-                        else if (impRtnModel.ShowType.Equals("0") || impRtnModel.ShowType.Equals("00"))//返回文件
+                        else if (impRtnModel.ShowType.Equals("0") || impRtnModel.ShowType.Equals("00") || impRtnModel.ShowType.Equals("000"))//返回文件
                         {
                             ControlModel controlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("物料编码")).FirstOrDefault();
                             if (controlModel == null)
@@ -2803,6 +2814,11 @@ namespace Lskj.PubBill
                                 return;
                             }
                             DataTable sourceTable = gcMain.gridControl.DataSourceTable();
+                            if (impRtnModel.ShowType.Equals("000") && sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted).Count() > 0)
+                            {
+                                MessageUtil.Show($"只能选择单个文件，请删除后再添加");
+                                return;
+                            }
                             if (sourceTable != null && impRtnModel.FileNames != null)
                             {
                                 string afterBomFieldName = impRtnModel.AfterBomFieldName;