diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll index e2c1f30..72c7e5f 100644 Binary files a/TradeManage/bin/TradeManageNew.dll and b/TradeManage/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/DataNew.cs b/TradeManageNew/DataNew.cs index a0bf422..914cccc 100644 --- a/TradeManageNew/DataNew.cs +++ b/TradeManageNew/DataNew.cs @@ -31155,6 +31155,26 @@ left Join JC_Shop b on a.Shopid = b.Shopid"; } #endregion - + #region 根据sku读temu订单 + public static List GetTemuOrderFromSKU(string SKU) + { + + string tsql = @" +select c.SKU1,KcNum=c.WestNum+c.EastNum,c.WestNum,c.EastNum,b.*,lr=b.TotalPrice-b.yj-b.ck-b.cb-b.hwsf-b.sjyf-b.sjtc from DT_OrderGoods a +inner join ( +select a.orderid,c.ShopName,a.PlatOrderCode,a.InDate,TotalPrice=isnull(a.TotalPrice,0),yj=isnull(b.yj,0),ck=isnull(b.ck,0),sjtc=isnull(b.sjtc,isnull(b.tc,0)),sjyf=isnull(b.sjyf,isnull(b.yf,0)),cb=isnull(b.sjcb,isnull(b.cb,0))/6.3,hwsf=isnull(b.hwsf,0)/6.3,b.sku from DT_OrderInfo a +left join JC_Shop c on a.ShopId=c.ShopId +left join DT_Fees b on a.OrderId=b.orderid +where a.State>0 and a.State<3 and a.PlatId=23)b on a.OrderId=b.OrderId +inner join HW_GoodsDetail c on a.DetailId=c.DetailId +where a.SKU1=@SKU"; + Database db = DatabaseFactory.CreateDatabase(); + DbCommand cmd = db.GetSqlStringCommand(tsql); + db.AddInParameter(cmd, "@SKU", DbType.String, SKU); + DataTable tb = db.ExecuteDataTable(cmd); + return tb.ToList(); + + } + #endregion } } \ No newline at end of file diff --git a/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx b/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx index 7697324..ddfc44b 100644 --- a/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx +++ b/TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx @@ -122,6 +122,11 @@ col.CellTemplate = "{Bind LeftNumE}"; Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); + col.HeaderText = "总库存"; + col.CellTemplate = "{Bind LeftNumAll}"; + Array.add(datagrid1.Columns, col); + col = new nblf.ui.DataGridColumn(); col.HeaderText = "库龄"; col.CellTemplate = "{Bind PositionAge}"; diff --git a/TradeManageNew/ModelNew.cs b/TradeManageNew/ModelNew.cs index 3382cd9..5dd3d6a 100644 --- a/TradeManageNew/ModelNew.cs +++ b/TradeManageNew/ModelNew.cs @@ -11360,4 +11360,25 @@ namespace TradeManageNew /// public Int32? OutNum { get; set; } } + + public class TemuSKUOrder + { + public String ShopName { get; set; } + public String PlatOrderCode { get; set; } + public String SKU1 { get; set; } + + public Int32? WestNum { get; set; } + public Int32? EastNum { get; set; } + public Int32? KCNum { get; set; } + public DateTime? InDate { get; set; } + public Decimal? lr { get; set; } + + public Decimal? TotalPrice { get; set; } + public Decimal? yj { get; set; } + public Decimal? ck { get; set; } + public Decimal? sjtc { get; set; } + public Decimal? sjyf { get; set; } + public Decimal? cb { get; set; } + public Decimal? hwsf { get; set; } + } } \ No newline at end of file diff --git a/TradeManageNew/bin/TradeManageNew.dll b/TradeManageNew/bin/TradeManageNew.dll index 72c7e5f..94db7c3 100644 Binary files a/TradeManageNew/bin/TradeManageNew.dll and b/TradeManageNew/bin/TradeManageNew.dll differ diff --git a/TradeManageNew/bin/TradeManageNew.dll.config b/TradeManageNew/bin/TradeManageNew.dll.config index 4b0b07e..66850e4 100644 --- a/TradeManageNew/bin/TradeManageNew.dll.config +++ b/TradeManageNew/bin/TradeManageNew.dll.config @@ -63,11 +63,11 @@ - + - + diff --git a/TradeManageNew/bin/TradeManageNew.pdb b/TradeManageNew/bin/TradeManageNew.pdb index 36621fe..8ccfe51 100644 Binary files a/TradeManageNew/bin/TradeManageNew.pdb and b/TradeManageNew/bin/TradeManageNew.pdb differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.dll b/TradeManageNew/obj/Debug/TradeManageNew.dll index 72c7e5f..94db7c3 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.dll and b/TradeManageNew/obj/Debug/TradeManageNew.dll differ diff --git a/TradeManageNew/obj/Debug/TradeManageNew.pdb b/TradeManageNew/obj/Debug/TradeManageNew.pdb index 36621fe..8ccfe51 100644 Binary files a/TradeManageNew/obj/Debug/TradeManageNew.pdb and b/TradeManageNew/obj/Debug/TradeManageNew.pdb differ