|
@ -438,9 +438,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts |
|
|
|
|
|
|
|
|
var error = from itm1 in outPutDetail |
|
|
var error = from itm1 in outPutDetail |
|
|
join itm2 in _ls1 on |
|
|
join itm2 in _ls1 on |
|
|
new { itm1.MaterialCode, itm1.OrderBillNum } |
|
|
new { itm1.MaterialCode, itm1.OrderBillNum,itm1.WmsBillNum } |
|
|
equals |
|
|
equals |
|
|
new { itm2.MaterialCode, itm2.OrderBillNum } |
|
|
new { itm2.MaterialCode, itm2.OrderBillNum,itm2.WmsBillNum } |
|
|
select itm1; |
|
|
select itm1; |
|
|
var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); |
|
|
var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) }); |
|
|
|
|
|
|
|
@ -449,8 +449,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts |
|
|
{ |
|
|
{ |
|
|
checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); |
|
|
checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) }); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (checkList.Count > 0) |
|
|
if (checkList.Count > 0) |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
|