|
@@ -117,7 +117,7 @@ public class StoreApplyHelper
|
|
|
dataDic[store.UserId] += AmountMore;
|
|
|
}
|
|
|
}
|
|
|
- dt = CustomerSqlConn.dtable("select StoreId,count(Id) from StoreStockChange where Id>=528358 and CreateDate>='" + start + "' and CreateDate<'" + end + "' and BrandId in (3,5,9,11) and TransType in (10,11,2) and StoreId>0" + condition + " group by StoreId", connstr);
|
|
|
+ dt = CustomerSqlConn.dtable("select StoreId,count(Id) from StoreStockChange where Id>=528358 and CreateDate>='" + start + "' and CreateDate<'" + end + "' and BrandId in (3,5,9,11,13) and TransType in (10,11,2) and StoreId>0" + condition + " group by StoreId", connstr);
|
|
|
foreach(DataRow dr in dt.Rows)
|
|
|
{
|
|
|
int StoreId = int.Parse(function.CheckInt(dr["StoreId"].ToString()));
|
|
@@ -181,7 +181,7 @@ public class StoreApplyHelper
|
|
|
{
|
|
|
AmountMore += decimal.Parse(function.CheckNum(dtmore.Rows[0][0].ToString()));
|
|
|
}
|
|
|
- dtmore = CustomerSqlConn.dtable("select count(Id)*300 from PosMachinesTwo pos where StoreId in (select Id from StoreHouse where UserId=" + UserId + " and Sort=0) and BuyUserId=0 and BrandId in (3,5,9,11) and `Status`>-1", connstr);
|
|
|
+ dtmore = CustomerSqlConn.dtable("select count(Id)*300 from PosMachinesTwo pos where StoreId in (select Id from StoreHouse where UserId=" + UserId + " and Sort=0) and BuyUserId=0 and BrandId in (3,5,9,11,13) and `Status`>-1", connstr);
|
|
|
if(dtmore.Rows.Count > 0)
|
|
|
{
|
|
|
AmountMore += decimal.Parse(function.CheckNum(dtmore.Rows[0][0].ToString()));
|
|
@@ -192,7 +192,7 @@ public class StoreApplyHelper
|
|
|
{
|
|
|
AmountMore -= decimal.Parse(function.CheckNum(dtmore.Rows[0][0].ToString()));
|
|
|
}
|
|
|
- dtmore = CustomerSqlConn.dtable("select count(Id)*300 from PreSendStockDetail pos where FromStoreId in (select Id from StoreHouse where UserId=" + UserId + " and Sort=0) and BrandId in (3,5,9,11) and AuthFlag=1 and ApplyFlag=0 and `Status`>-1 and `Status`<2", connstr);
|
|
|
+ dtmore = CustomerSqlConn.dtable("select count(Id)*300 from PreSendStockDetail pos where FromStoreId in (select Id from StoreHouse where UserId=" + UserId + " and Sort=0) and BrandId in (3,5,9,11,13) and AuthFlag=1 and ApplyFlag=0 and `Status`>-1 and `Status`<2", connstr);
|
|
|
if(dtmore.Rows.Count > 0)
|
|
|
{
|
|
|
AmountMore -= decimal.Parse(function.CheckNum(dtmore.Rows[0][0].ToString()));
|
|
@@ -308,7 +308,7 @@ public class StoreApplyHelper
|
|
|
{
|
|
|
Amount += 200;
|
|
|
}
|
|
|
- else if(pos.BrandId == 3 || pos.BrandId == 5 || pos.BrandId == 9 || pos.BrandId == 11)
|
|
|
+ else if(pos.BrandId == 3 || pos.BrandId == 5 || pos.BrandId == 9 || pos.BrandId == 11 || pos.BrandId == 13)
|
|
|
{
|
|
|
Amount += 300;
|
|
|
}
|
|
@@ -335,7 +335,7 @@ public class StoreApplyHelper
|
|
|
{
|
|
|
Amount += 200 * OpStoreNum;
|
|
|
}
|
|
|
- else if(BrandId == 3 || BrandId == 5 || BrandId == 9 || BrandId == 11)
|
|
|
+ else if(BrandId == 3 || BrandId == 5 || BrandId == 9 || BrandId == 11 || BrandId == 13)
|
|
|
{
|
|
|
Amount += 300 * OpStoreNum;
|
|
|
}
|