|
@ -247,13 +247,16 @@ namespace SCP.PlanData |
|
|
FileUp.Reset(); |
|
|
FileUp.Reset(); |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
// 行号去重
|
|
|
if (p_modtype == BillModType.Contract) |
|
|
List<string> polineList = list.Select(a => a.行号.Trim()).Distinct().ToList(); |
|
|
|
|
|
if (polineList.Count() != list.Count()) |
|
|
|
|
|
{ |
|
|
{ |
|
|
Alert.Show("行号不允许重复!"); |
|
|
// 行号去重
|
|
|
FileUp.Reset(); |
|
|
List<string> polineList = list.Select(a => a.行号.Trim()).Distinct().ToList(); |
|
|
return; |
|
|
if (polineList.Count() != list.Count()) |
|
|
|
|
|
{ |
|
|
|
|
|
Alert.Show("行号不允许重复!"); |
|
|
|
|
|
FileUp.Reset(); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
var checkret = SCP_PO_CONTROLLER.Check_EXCEL_PO_MOD(list, p_modtype, CurrentUser.FactoryList[0], CurrentUser.SubSiteList[0]); |
|
|
var checkret = SCP_PO_CONTROLLER.Check_EXCEL_PO_MOD(list, p_modtype, CurrentUser.FactoryList[0], CurrentUser.SubSiteList[0]); |
|
|
if (checkret.State == ReturnStatus.Failed && checkret.Result == false) |
|
|
if (checkret.State == ReturnStatus.Failed && checkret.Result == false) |
|
|