cyf/lserp_cs_6.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SVN r674

Browse Source 
SVN-Revision: r674
This commit is contained in:
wyf
2025-06-05 09:30:16 +00:00
parent 183458b4c7
commit fa5de16576
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+18 -2
View File
@@ -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;