diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config
new file mode 100644
index 0000000..fce7e83
--- /dev/null
+++ b/.vs/config/applicationhost.config
@@ -0,0 +1,987 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TemuGoodsTemplate2.xls b/TemuGoodsTemplate2.xls
new file mode 100644
index 0000000..19e25ad
Binary files /dev/null and b/TemuGoodsTemplate2.xls differ
diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll
index a432501..d620220 100644
Binary files a/TradeManage/bin/TradeManageNew.dll and b/TradeManage/bin/TradeManageNew.dll differ
diff --git a/TradeManageNew/DD_OrderServiceNew.asmx.cs b/TradeManageNew/DD_OrderServiceNew.asmx.cs
index 6021156..f242b31 100644
--- a/TradeManageNew/DD_OrderServiceNew.asmx.cs
+++ b/TradeManageNew/DD_OrderServiceNew.asmx.cs
@@ -30577,26 +30577,37 @@ namespace TradeManageNew
var dlist = DataNew.GetListTemuShopGoodActiveDetail(ids);
if (dlist != null)
{
+
foreach (var omd in resultModel.DataSource)
{
- string ActiveInfo = "";
+ string shtml = "
";
+ shtml += "SKU | SKUId | 基础价格 | 折扣 | 售价 | 活动库存 | 已出数量 | 活动日期 | 状态 | |
";
var dmd = dlist.FindAll(n => n.ActiveId == omd.ID);
if (dmd != null)
{
foreach (var ddmd in dmd)
{
- string zt = " 活动状态:正常";
+ shtml +="";
+ string zt = "正常";
if(ddmd.State==0)
- zt = "活动状态:已结束";
- string rq = " 活动日期:";
+ zt = "已结束";
+ string rq = "";
if(ddmd.SDate!=null)
rq += ddmd.SDate.Value.ToString("yyyy-MM-dd HH:mm");
if (ddmd.EDate != null)
rq +="--"+ddmd.EDate.Value.ToString("yyyy-MM-dd HH:mm");
- ActiveInfo += "结束活动 折扣:" + ddmd.OffNum.Value.ToString() + " 售价:"+ ddmd.SalePrice.Value.ToString() + " 活动库存:"+ ddmd.ActiveNum.Value.ToString() + " 已出订单:"+ ddmd.OutNum.Value.ToString() +zt+rq+"
";
+ string ActiveNumname = ddmd.ActiveNum.Value.ToString();
+ if (ddmd.ShareId > 0)
+ ActiveNumname = "共享库存";
+ if (ddmd.BasePrice == null)
+ ddmd.BasePrice = 0;
+
+ shtml += "" + ddmd.SKU + " | " + ddmd.SKUId + " | " + ddmd.BasePrice.Value.ToString() + " | " + ddmd.OffNum.Value.ToString() + " | " + ddmd.SalePrice.Value.ToString() + " | " + ActiveNumname + " | " + ddmd.OutNum.Value.ToString() + " | " + rq + " | " + zt+ " | 结束活动 | ";
+ shtml += "
";
}
}
- omd.ActiveInfo = ActiveInfo;
+ shtml += "
";
+ omd.ActiveInfo = shtml;
}
}
}
diff --git a/TradeManageNew/DataNew.cs b/TradeManageNew/DataNew.cs
index cccc144..486a0a9 100644
--- a/TradeManageNew/DataNew.cs
+++ b/TradeManageNew/DataNew.cs
@@ -31144,15 +31144,23 @@ select @ID";
db.AddInParameter(cmd, "@PostPrice", DbType.Decimal, Model.PostPrice);
db.AddInParameter(cmd, "@State", DbType.Int32, Model.State);
int a = Convert.ToInt32(db.ExecuteScalar(cmd));
- tsql = @"INSERT INTO [TemuShopGoodActiveDetail]([ActiveId],[OffNum],[SalePrice],[ActiveNum],[OutNum],State,SDate,EDate)values(@ActiveId,@OffNum,@SalePrice,@ActiveNum,@OutNum,@State,@SDate,@EDate)";
+ tsql = @"INSERT INTO [TemuShopGoodActiveDetail]([ActiveId],[OffNum],[SalePrice],[ActiveNum],[OutNum],[State],[SDate],[EDate],[SKUId],[SKU],[BasePrice],[ShareId],[TotalOutNum])values(@ActiveId,@OffNum,@SalePrice,@ActiveNum,@OutNum,@State,@SDate,@EDate,@SKUId,@SKU,@BasePrice,@ShareId,@TotalOutNum)
+set @ID=SCOPE_IDENTITY()
+select @ID
+";
cmd = db.GetSqlStringCommand(tsql);
if (Model.ListModel!=null)
{
+ int shareid = 0;
foreach (var item in Model.ListModel)
{
cmd.Parameters.Clear();
item.OutNum = 0;
+ item.TotalOutNum = 0;
item.State = 1;
+ if (item.ActiveNum == 0)
+ item.ShareId = shareid;//共享存入上一条数据的明细id
+ db.AddInParameter(cmd, "@ID", DbType.Int32, item.Id);
db.AddInParameter(cmd, "@ActiveId", DbType.Int32, a);
db.AddInParameter(cmd, "@OffNum", DbType.Decimal, item.OffNum);
db.AddInParameter(cmd, "@SalePrice", DbType.Decimal, item.SalePrice);
@@ -31161,7 +31169,14 @@ select @ID";
db.AddInParameter(cmd, "@State", DbType.Int32, item.State);
db.AddInParameter(cmd, "@SDate", DbType.DateTime, item.SDate);
db.AddInParameter(cmd, "@EDate", DbType.DateTime, item.EDate);
- db.ExecuteNonQuery(cmd);
+ db.AddInParameter(cmd, "@SKUId", DbType.String, item.SKUId);
+ db.AddInParameter(cmd, "@SKU", DbType.String, item.SKU);
+ db.AddInParameter(cmd, "@BasePrice", DbType.Decimal, item.BasePrice);
+ db.AddInParameter(cmd, "@ShareId", DbType.Int32, item.ShareId);
+ db.AddInParameter(cmd, "@TotalOutNum", DbType.Int32, item.TotalOutNum);
+ int b = Convert.ToInt32(db.ExecuteScalar(cmd));
+ if (item.ActiveNum > 0)
+ shareid = b;
}
}
@@ -31283,6 +31298,14 @@ delete from TemuShopGoodActiveDetail where Id=@Id";
{
model = ds.Tables[0].Rows[0].ToModel();
model.ListModel = ds.Tables[1].ToList();
+ foreach (var md in model.ListModel)
+ {
+ if (md.ShareId > 0)
+ {
+ md.IsShare ="共享库存";
+ md.IsDisabled="disabled";
+ }
+ }
}
return model;
}
@@ -31350,7 +31373,7 @@ delete from TemuShopGoodActiveDetail where Id=@Id";
public static List GetListTemuShopGoodActiveDetail(string ids)
{
//string tsql = "select a.ID,a.Shopid,a.SKU,a.SPUID,a.BasePrice,a.CreateUserId,a.CreateTime,a.PostPrice,a.State from TemuShopGoodActive";
- string tsql = "select * from TemuShopGoodActiveDetail where ActiveId in (" + ids + ")";
+ string tsql = "select * from TemuShopGoodActiveDetail where ActiveId in (" + ids + ") order by id";
Database db = DatabaseFactory.CreateDatabase();
DbCommand cmd = db.GetSqlStringCommand(tsql);
DataTable tb = db.ExecuteDataTable(cmd);
@@ -31383,6 +31406,7 @@ left join jc_userinfo c on a.CreateUserId=c.UserId
return ListModel;
}
#endregion
+
#region 根据sku读temu订单
public static List GetTemuOrderFromSKU(string SKU)
diff --git a/TradeManageNew/HuoWuServiceNew.asmx.cs b/TradeManageNew/HuoWuServiceNew.asmx.cs
index 1d4388e..ecf7f41 100644
--- a/TradeManageNew/HuoWuServiceNew.asmx.cs
+++ b/TradeManageNew/HuoWuServiceNew.asmx.cs
@@ -7388,7 +7388,7 @@ namespace TradeManageNew
//temu 活动导入
[WebMethod(EnableSession = true)]
- public APIReturnModel ImportTemuHuoDongPrices(string filePath)
+ public APIReturnModel ImportTemuHuoDongPrices_old(string filePath)
{
//PagesNew.Login(this.Session);
var userid = Convert.ToInt32(base.Session["UserId"]);
@@ -7475,15 +7475,14 @@ namespace TradeManageNew
{
Shopid = shop.ShopId.Value,
ShopName= shopName,
- SPUID = SKUID,
- SKU = sku,
- BasePrice = Convert.ToDecimal(tb.Rows[0]["价格"].ToString()),
+
CreateUserId = userid,
CreateTime = DateTime.Now,
State = 1,
};
var mddetail = new TemuShopGoodActiveDetail()
{
+
OffNum = Convert.ToDecimal(tb.Rows[0]["折扣"].ToString()),
SalePrice = Convert.ToDecimal(tb.Rows[0]["售价"].ToString()),
ActiveNum = Convert.ToInt32(tb.Rows[0]["数量"].ToString()),
@@ -7665,6 +7664,159 @@ namespace TradeManageNew
}
+ //temu 活动导入(褚改)
+ [WebMethod(EnableSession = true)]
+ public APIReturnModel ImportTemuHuoDongPrices(string filePath)
+ {
+ //PagesNew.Login(this.Session);
+ var userid = Convert.ToInt32(base.Session["UserId"]);
+ string ServerFileName = AppDomain.CurrentDomain.BaseDirectory + filePath;
+ var rmodel = new APIReturnModel();
+ try
+ {
+ MicrosoftExcel excel = new MicrosoftExcel();
+ DataTable tb = excel.ImportExcel(ServerFileName);
+
+ string error = "";
+ if (tb.Columns.Contains("店铺名") == false) { error = error + "导入模板的 店铺名 列不存在"; }
+ if (tb.Columns.Contains("SKU") == false) { error = error + "导入模板的 SKU 列不存在"; }
+ if (tb.Columns.Contains("SKUID") == false) { error = error + "导入模板的 SKUID 列不存在"; }
+ if (tb.Columns.Contains("价格") == false) { error = error + "导入模板的 价格 列不存在"; }
+ if (tb.Columns.Contains("折扣") == false) { error = error + "导入模板的 折扣 列不存在"; }
+ if (tb.Columns.Contains("共享库存") == false) { error = error + "导入模板的 共享库存 列不存在"; }
+ if (tb.Columns.Contains("售价") == false) { error = error + "导入模板的 售价 列不存在"; }
+ if (tb.Columns.Contains("数量") == false) { error = error + "导入模板的 数量 列不存在"; }
+
+ if (string.IsNullOrEmpty(error) == false)
+ {
+ rmodel.Code = 0;
+ rmodel.Message = error;
+ }
+
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < tb.Rows.Count; i++)
+ {
+
+ var shopName = tb.Rows[i]["店铺名"].ToString();
+ if (i == 0)
+ {
+ if (string.IsNullOrEmpty(shopName))
+ {
+ sb.Append("第1行店铺名不能为空;");
+
+ }
+ }
+ if (shopName != "")
+ {
+ var shop = DataNew.GetShopByShopName(shopName);
+ if (shop == null)
+ {
+ sb.Append("第" + (i+1).ToString() + "行店铺名:" + shopName + "不存在;");
+ }
+ }
+ var sku = tb.Rows[i]["SKU"].ToString();
+ if (string.IsNullOrEmpty(sku))
+ {
+ sb.Append("第" + (i + 1).ToString() + "行SKU不能为空;");
+ }
+ var SKUID = tb.Rows[i]["SKUID"].ToString();
+ if (string.IsNullOrEmpty(SKUID))
+ {
+ sb.Append("第" + (i + 1).ToString() + "行SKUID不能为空;");
+ }
+
+ if (string.IsNullOrEmpty(tb.Rows[i]["价格"].ToString()))
+ {
+ sb.Append("第" + (i + 1).ToString() + "行价格不能为空;");
+ }
+
+ if (string.IsNullOrEmpty(tb.Rows[i]["折扣"].ToString()))
+ {
+ sb.Append("第" + (i + 1).ToString() + "行折扣不能为空;");
+ }
+ if (string.IsNullOrEmpty(tb.Rows[i]["售价"].ToString()))
+ {
+ sb.Append("第" + (i + 1).ToString() + "行售价不能为空;");
+ }
+ if (tb.Rows[i]["共享库存"].ToString() != "是" && string.IsNullOrEmpty(tb.Rows[i]["数量"].ToString()))
+ {
+ sb.Append("第" + (i + 1).ToString() + "行数量不能为空;");
+ }
+ if (string.IsNullOrEmpty(tb.Rows[i]["开始时间"].ToString()))
+ {
+ sb.Append("第" + (i + 1).ToString() + "行开始时间不能为空;");
+ }
+ if (string.IsNullOrEmpty(tb.Rows[i]["结束时间"].ToString()))
+ {
+ sb.Append("第" + (i + 1).ToString() + "行结束时间不能为空;");
+ }
+ }
+ if (sb.Length > 0)
+ {
+ rmodel.Code = 0;
+ rmodel.Message = sb.ToString();
+ return rmodel;
+ }
+
+ string shopname = "";
+ TemuShopGoodActive Model = null;
+ List mlist = null;
+ for (int i = 0; i < tb.Rows.Count; i++)
+ {
+ if (i == 0 ||(tb.Rows[i]["店铺名"].ToString()!=""&&tb.Rows[i]["店铺名"].ToString()!= shopname))
+ {
+ if (Model != null)
+ {
+ Model.ListModel = mlist;
+ DataNew.Save_TemuShopGoodActive(Model);
+ Model = null;
+ mlist = null;
+ }
+ shopname = tb.Rows[i]["店铺名"].ToString();
+ Model = new TemuShopGoodActive();
+ Model.State = 1;
+ Model.CreateTime = DateTime.Now;
+ Model.CreateUserId = Convert.ToInt32(Session["UserId"]);
+ var shop = DataNew.GetShopByShopName(shopname);
+ Model.Shopid = shop.ShopId;
+ mlist = new List();
+
+ }
+ TemuShopGoodActiveDetail mmd = new TemuShopGoodActiveDetail();
+ mmd.SKU = tb.Rows[i]["SKU"].ToString();
+ mmd.SKUId = tb.Rows[i]["SKUID"].ToString();
+ mmd.BasePrice =Convert.ToDecimal(tb.Rows[i]["价格"].ToString());
+ mmd.OffNum = Convert.ToDecimal(tb.Rows[i]["折扣"].ToString());
+ mmd.SalePrice = Convert.ToDecimal(tb.Rows[i]["售价"].ToString());
+ if (tb.Rows[i]["共享库存"].ToString()== "是")
+ mmd.ActiveNum =0;
+ else
+ mmd.ActiveNum = Convert.ToInt32(tb.Rows[i]["数量"].ToString());
+ mmd.SDate = Convert.ToDateTime(tb.Rows[i]["开始时间"].ToString());
+ mmd.EDate = Convert.ToDateTime(tb.Rows[i]["结束时间"].ToString());
+ mlist.Add(mmd);
+
+
+ }
+
+ if (Model != null)
+ {
+ Model.ListModel = mlist;
+ DataNew.Save_TemuShopGoodActive(Model);
+
+ }
+ rmodel.Code = 1;
+ rmodel.Message = "";
+ return rmodel;
+ }
+ catch (Exception ex)
+ {
+ rmodel.Code = 0;
+ rmodel.Message = ex.Message;
+ return rmodel;
+ }
+ }
+
[WebMethod(EnableSession = true)]
diff --git a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
index 74413bb..a86b12f 100644
--- a/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
+++ b/TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx
@@ -83,13 +83,24 @@
});
$("#cmdAdd2").click(function () {
- if ($("#txtBasePrice").val() == "") {
- alert("请先填写基础价格");
- return;
- }
+ //if ($("#txtBasePrice").val() == "") {
+ // alert("请先填写基础价格");
+ // return;
+ //}
datagrid2.Add_NewRow();
});
- $("input[ColName='OffNum']").live("keyup", function () {
+ $("#cmdAdd3").click(function () {
+ //if ($("#txtBasePrice").val() == "") {
+ // alert("请先填写基础价格");
+ // return;
+ //}
+ var md = new Object();
+ md.IsShare = '共享库存';
+ md.IsDisabled = 'disabled';
+ md.ActiveNum = 0;
+ datagrid2.Add_Row(md);
+ });
+ $("input[ColName='OffNum'],input[ColName='BasePrice']").live("keyup", function () {
hesl();
@@ -111,6 +122,10 @@
//else { $("#cmdSave").show(); }
//if (Model.State == 2) { $("#tr1").show(); }
//else { $("#tr1").hide(); }
+ if (Model.ShareId > 0) {
+ Model.IsShare = '共享库存';
+ Model.IsDisabled = 'disabled';
+ }
GetModel(Model.ID);
@@ -178,18 +193,22 @@
}
function hesl() {
- var jc = parseFloat($("#txtBasePrice").val());
- $("input[ColName='OffNum']").each(function () {
-
+
+ $("input[ColName='OffNum'],input[ColName='BasePrice']").each(function () {
+ var obj1 = $(this).parent().parent().find("input[ColName='BasePrice']"); //parseFloat($("#txtBasePrice").val());
var obj2 = $(this).parent().parent().find("input[ColName='SalePrice']");
- if ($(this).val() != "" && jc > 0) {
+ var obj3 = $(this).parent().parent().find("input[ColName='OffNum']");
+ var jc = 0;
+ if (obj1 != null && $(obj1).val() != "")
+ jc = parseFloat($(obj1).val());
+ if ($(obj3).val() != "" && jc > 0) {
- $(obj2).val(parseFloat($(this).val() * jc * 0.1));
+ $(obj2).val(parseFloat($(obj3).val() * jc * 0.1));
}
});
-
+
}
//#region 初始化DataGrid
function CreateDataGrid() {
@@ -197,36 +216,25 @@
col = new nblf.ui.DataGridColumn();
col.HeaderText = "店铺";
col.CellTemplate = "{Bind ShopName}";
+ col.Width = "100px";
Array.add(datagrid1.Columns, col);
col = new nblf.ui.DataGridColumn();
- col.HeaderText = "SKU";
- col.CellTemplate = "{Bind SKU}";
- Array.add(datagrid1.Columns, col);
-
- col = new nblf.ui.DataGridColumn();
- col.HeaderText = "SKUID";
- col.CellTemplate = "{Bind SPUID}";
- Array.add(datagrid1.Columns, col);
-
- col = new nblf.ui.DataGridColumn();
- col.HeaderText = "基础价格";
- col.CellTemplate = "{Bind BasePrice}";
- Array.add(datagrid1.Columns, col);
- col = new nblf.ui.DataGridColumn();
- col.HeaderText = "活动信息";
+ col.HeaderText = "活动";
col.CellTemplate = "{Bind ActiveInfo}";
-
+ col.Align = "Left";
Array.add(datagrid1.Columns, col);
col = new nblf.ui.DataGridColumn();
col.HeaderText = "创建人";
col.CellTemplate = "{Bind CreateUserName}";
+ col.Width = "100px";
Array.add(datagrid1.Columns, col);
col = new nblf.ui.DataGridColumn();
col.HeaderText = "创建日期";
col.CellTemplate = "{Bind CreateTime,yyyy-MM-dd}";
+ col.Width = "120px";
Array.add(datagrid1.Columns, col);
@@ -237,7 +245,7 @@
col = new nblf.ui.DataGridColumn();
col.HeaderText = "操作";
- col.Width = "160px";
+ col.Width = "80px";
// col.CellTemplate = "编辑 复制 结束活动";
col.CellTemplate = "复制";
Array.add(datagrid1.Columns, col);
@@ -256,6 +264,20 @@
//#region 初始化DataGrid2
function CreateDataGrid2() {
+ var col = new nblf.ui.DataGridColumn();
+ col.HeaderText = "SKUId";
+ col.CellTemplate = "";
+ Array.add(datagrid2.Columns, col);
+
+ col = new nblf.ui.DataGridColumn();
+ col.HeaderText = "SKU";
+ col.CellTemplate = "";
+ Array.add(datagrid2.Columns, col);
+
+ col = new nblf.ui.DataGridColumn();
+ col.HeaderText = "BasePrice";
+ col.CellTemplate = "";
+ Array.add(datagrid2.Columns, col);
col = new nblf.ui.DataGridColumn();
col.HeaderText = "折扣";
col.CellTemplate = "";
@@ -265,10 +287,13 @@
col.HeaderText = "售价";
col.CellTemplate = "";
Array.add(datagrid2.Columns, col);
-
+ col = new nblf.ui.DataGridColumn();
+ col.HeaderText = "是否共享库存";
+ col.CellTemplate = "{Bind IsShare}";
+ Array.add(datagrid2.Columns, col);
col = new nblf.ui.DataGridColumn();
col.HeaderText = "活动库存数量";
- col.CellTemplate = "";
+ col.CellTemplate = "";
Array.add(datagrid2.Columns, col);
col = new nblf.ui.DataGridColumn();
@@ -534,7 +559,7 @@