|
|
@@ -150,37 +150,43 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
bool check = spdb.TradeRecord.Any(m => m.TradeSnNo == pos.PosSn);
|
|
|
if (check)
|
|
|
{
|
|
|
+ string SpTradeRecordId = function.ReadInstance("/PublicParams/SpTradeRecordId.txt");
|
|
|
+ if(string.IsNullOrEmpty(SpTradeRecordId))
|
|
|
+ {
|
|
|
+ SpTradeRecordId = "2780299";
|
|
|
+ }
|
|
|
+ int StartId = int.Parse(function.CheckInt(SpTradeRecordId));
|
|
|
if (pos.BrandId == 1)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 2)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
|
|
|
}
|
|
|
else if (pos.BrandId == 3)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 4 || pos.BrandId == 5)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 6)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 7)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "7" && m.TradeStatus == "00").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "7" && m.TradeStatus == "00").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 8)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 9)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId && m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
pos.CreditTrade = CreditTrade;
|
|
|
db.SaveChanges();
|
|
|
@@ -400,33 +406,39 @@ namespace MySystem.Areas.Admin.Controllers
|
|
|
bool check = spdb.TradeRecord.Any(m => m.TradeSnNo == pos.PosSn);
|
|
|
if (check)
|
|
|
{
|
|
|
+ string SpTradeRecordId = function.ReadInstance("/PublicParams/SpTradeRecordId.txt");
|
|
|
+ if(string.IsNullOrEmpty(SpTradeRecordId))
|
|
|
+ {
|
|
|
+ SpTradeRecordId = "2780299";
|
|
|
+ }
|
|
|
+ int StartId = int.Parse(function.CheckInt(SpTradeRecordId));
|
|
|
if (pos.BrandId == 1)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M700")).Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 2)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "2").Sum(m => m.TradeAmount);
|
|
|
}
|
|
|
else if (pos.BrandId == 3)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "1" && m.SerEntryMode != "N" && m.MerNo.StartsWith("M900")).Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 4 || pos.BrandId == 5)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "4").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 6)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "6").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 8)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "8").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
else if (pos.BrandId == 9)
|
|
|
{
|
|
|
- CreditTrade = spdb.TradeRecord.Where(m => m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
|
|
|
+ CreditTrade = spdb.TradeRecord.Where(m => m.Id > StartId &&m.TradeSnNo == pos.PosSn && m.ProductType == "9").Sum(m => m.TradeAmount) / 100;
|
|
|
}
|
|
|
pos.CreditTrade = CreditTrade;
|
|
|
db.SaveChanges();
|