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

SVN r684

Browse Source 
SVN-Revision: r684
This commit is contained in:
wyf
2025-06-06 04:02:32 +00:00
parent fb1916d3b3
commit 899cc71087
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+14 -4
View File
@@ -982,7 +982,7 @@ namespace Lskj.PubBill
}
}
}
CommonMenu menu = new CommonMenu(this.SysModel, this.ControlObj, this.gcMain);
menu.ApplyBefore += new CommonToolApplyEventHandler(OnMenuApplyBefore);
menu.DynamicLinkAfter += new CommonToolAfterDynamicLinkEventHandler(OnDynamicLinkAfter);
@@ -2771,7 +2771,7 @@ 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") || impRtnModel.ShowType.Equals("7"))//执行保存
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") || impRtnModel.ShowType.Equals("8"))//执行保存
{
CommonMenu menu = (CommonMenu)sender;
menu.issuccess = impRtnModel.CanSave;
@@ -2804,6 +2804,8 @@ namespace Lskj.PubBill
MessageUtil.Show($"文件分类必填");
return;
}
ControlModel oldPIDControlModel = ControlObj.ControlModels.Where(n => n.LabelText.Equals("旧编码")).FirstOrDefault();
string oldPID = ControlObj.GetControlValue(oldPIDControlModel);
DataTable sourceTable = gcMain.gridControl.DataSourceTable();
if (impRtnModel.ShowType.Equals("000") && sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted).Count() > 0)
{
@@ -2833,6 +2835,10 @@ namespace Lskj.PubBill
{
sourceTable.Columns.Add("BomAddSpeciesNo");
}
if (!sourceTable.Columns.Contains("BomAddOldProductId"))
{
sourceTable.Columns.Add("BomAddOldProductId");
}
DataTable dataTable = new DataTable();
dataTable.Columns.Add(afterBomFieldName);
dataTable.Columns.Add("BomFieldNameDir");
@@ -2840,6 +2846,7 @@ namespace Lskj.PubBill
dataTable.Columns.Add("BomMxAddState");
dataTable.Columns.Add("qms_laddf_mode");
dataTable.Columns.Add("BomAddSpeciesNo");
dataTable.Columns.Add("BomAddOldProductId");
IEnumerable<DataRow> rowsIEnumerable = sourceTable.Rows.Cast<DataRow>().Where(n => n.RowState != DataRowState.Deleted);
var mxRows = rowsIEnumerable.Where(n => (n[afterBomFieldName] + "").Trim().StartsWith("MX"));
DataRow mxRow = mxRows.FirstOrDefault();
@@ -2870,6 +2877,7 @@ namespace Lskj.PubBill
addRow["BomMxMainProduct"] = mxProductId;
addRow["qms_laddf_mode"] = addMode;
addRow["BomAddSpeciesNo"] = sepciesNo;
addRow["BomAddOldProductId"] = oldPID;
if (fileNameWithoutExtension.StartsWith("MX"))
{
addRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
@@ -2884,20 +2892,22 @@ namespace Lskj.PubBill
sourceRow["BomMxAddState"] = item["BomMxAddState"] + "";
sourceRow["qms_laddf_mode"] = item["qms_laddf_mode"] + "";
sourceRow["BomAddSpeciesNo"] = item["BomAddSpeciesNo"] + "";
sourceRow["BomAddOldProductId"] = item["BomAddOldProductId"] + "";
}
}
}
}
}
string movepage = (this.ControlObj.ReplaceControlValue("'{qms_maddf_addMode}'")== "6") ? "-9998" : "-9999";
string movepage = (this.ControlObj.ReplaceControlValue("{qms_maddf_addMode}").Equals("6")) ? "-9998" : "-9999";
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(movepage))
{
this.tb_buttom.TabControlObj.SelectedTabPage = xtraTabPage;
StaticControl.BomUnionPage = xtraTabPage;
if (xtraTabPage.Tag is GridControlEx)
{
DataRow dataRow = this.gcMain.GetViewFocusedDataRow();