|
|
|
@ -7456,6 +7456,14 @@ namespace TradeManageNew
|
|
|
|
|
{
|
|
|
|
|
sb.Append("第" + (2).ToString() + "行数量不能为空;");
|
|
|
|
|
}
|
|
|
|
|
if (string.IsNullOrEmpty(tb.Rows[0]["开始时间"].ToString()))
|
|
|
|
|
{
|
|
|
|
|
sb.Append("第" + (2).ToString() + "行开始时间不能为空;");
|
|
|
|
|
}
|
|
|
|
|
if (string.IsNullOrEmpty(tb.Rows[0]["结束时间"].ToString()))
|
|
|
|
|
{
|
|
|
|
|
sb.Append("第" + (2).ToString() + "行结束时间不能为空;");
|
|
|
|
|
}
|
|
|
|
|
if (sb.Length > 0)
|
|
|
|
|
{
|
|
|
|
|
rmodel.Code = 0;
|
|
|
|
@ -7479,6 +7487,9 @@ namespace TradeManageNew
|
|
|
|
|
OffNum = Convert.ToDecimal(tb.Rows[0]["折扣"].ToString()),
|
|
|
|
|
SalePrice = Convert.ToDecimal(tb.Rows[0]["售价"].ToString()),
|
|
|
|
|
ActiveNum = Convert.ToInt32(tb.Rows[0]["数量"].ToString()),
|
|
|
|
|
State = 1,
|
|
|
|
|
SDate = Convert.ToDateTime(tb.Rows[0]["开始时间"].ToString()),
|
|
|
|
|
EDate = Convert.ToDateTime(tb.Rows[0]["结束时间"].ToString()),
|
|
|
|
|
};
|
|
|
|
|
if (md.ListModel==null)
|
|
|
|
|
{
|
|
|
|
@ -7555,6 +7566,9 @@ namespace TradeManageNew
|
|
|
|
|
OffNum = Convert.ToDecimal(tb.Rows[i]["折扣"].ToString()),
|
|
|
|
|
SalePrice = Convert.ToDecimal(tb.Rows[i]["售价"].ToString()),
|
|
|
|
|
ActiveNum = Convert.ToInt32(tb.Rows[i]["数量"].ToString()),
|
|
|
|
|
State=1,
|
|
|
|
|
SDate = Convert.ToDateTime(tb.Rows[i]["开始时间"].ToString()),
|
|
|
|
|
EDate = Convert.ToDateTime(tb.Rows[i]["结束时间"].ToString()),
|
|
|
|
|
};
|
|
|
|
|
data.Where(p => p.Shopid == shopi.ShopId.Value && p.SKU == skui && p.SPUID == SKUIDi).FirstOrDefault().ListModel.Add(mddetail2);
|
|
|
|
|
}
|
|
|
|
@ -7616,7 +7630,10 @@ namespace TradeManageNew
|
|
|
|
|
{
|
|
|
|
|
OffNum = Convert.ToDecimal(tb.Rows[i]["折扣"].ToString()),
|
|
|
|
|
SalePrice = Convert.ToDecimal(tb.Rows[i]["售价"].ToString()),
|
|
|
|
|
State = 1,
|
|
|
|
|
ActiveNum = Convert.ToInt32(tb.Rows[i]["数量"].ToString()),
|
|
|
|
|
SDate = Convert.ToDateTime(tb.Rows[i]["开始时间"].ToString()),
|
|
|
|
|
EDate = Convert.ToDateTime(tb.Rows[i]["结束时间"].ToString()),
|
|
|
|
|
};
|
|
|
|
|
md2.ListModel.Add(mddetail2);
|
|
|
|
|
|
|
|
|
|