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

SVN r697

Browse Source 
SVN-Revision: r697
This commit is contained in:
wyf
2025-06-09 09:39:45 +00:00
parent 3a0cb68709
commit ac779c85fd
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
插件库/Lskj.PubBill/BillModule.cs
+2 -12
View File
@@ -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") || impRtnModel.ShowType.Equals("8"))//执行保存
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") || impRtnModel.ShowType.Equals("9"))//执行保存
{
CommonMenu menu = (CommonMenu)sender;
menu.issuccess = impRtnModel.CanSave;
@@ -2860,13 +2860,6 @@ namespace Lskj.PubBill
dataTable.Columns.Add("BomAddChangeFileId");
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();
if (mxRow != null)
{
mxRow["BomMxMainProduct"] = mxProductId;
mxRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
}
foreach (string fileName in impRtnModel.FileNames)
{
string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(fileName).Trim();
@@ -2892,10 +2885,7 @@ namespace Lskj.PubBill
addRow["BomAddSpeciesNo"] = sepciesNo;
addRow["BomAddChangeFileId"] = fileID;
addRow["BomAddOldProductId"] = oldPID;
if (fileNameWithoutExtension.StartsWith("MX"))
{
addRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
}
addRow["BomMxAddState"] = this.BillModel.SaveState ? "修改" : "新增";
dataTable.Rows.Add(addRow);
}
foreach (DataRow item in dataTable.Rows)