|
|
@ -253,7 +253,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts |
|
|
|
var _list = _excelHelper.ExcelToList<WmsHQFKanbanOutPutDetial>(); |
|
|
|
foreach (var itm in _list) |
|
|
|
{ |
|
|
|
itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create()); |
|
|
|
itm.SetData(GuidGenerator.Create(), string.Empty, !string.IsNullOrEmpty(itm.WmsBillNum) ? itm.WmsBillNum : string.Empty, input.Version, GuidGenerator.Create()); |
|
|
|
} |
|
|
|
_lst.AddRange(_list.ToArray()); |
|
|
|
} |
|
|
@ -262,9 +262,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts |
|
|
|
|
|
|
|
var error = from itm1 in outPutDetail |
|
|
|
join itm2 in _lst on |
|
|
|
new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine } |
|
|
|
new { itm1.MaterialCode, itm1.Kanban, itm1.PoLine } |
|
|
|
equals |
|
|
|
new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } |
|
|
|
new { itm2.MaterialCode, itm2.Kanban, itm2.PoLine } |
|
|
|
select itm1; |
|
|
|
var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); |
|
|
|
if (errList.Count() == 0) |
|
|
@ -318,7 +318,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts |
|
|
|
{ |
|
|
|
_billNum = string.Empty; |
|
|
|
} |
|
|
|
return ApplicationConsts.SuccessStr; ; |
|
|
|
return ApplicationConsts.SuccessStr; ; |
|
|
|
} |
|
|
|
/// <summary>
|
|
|
|
/// 出库界面功能,核准出库功能
|
|
|
@ -379,7 +379,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts |
|
|
|
await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync( |
|
|
|
sql |
|
|
|
); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
return true; |
|
|
|