Merge branch 'master' of http://60.12.218.120:8083/wufan/ERP

TradeManageNew/DataNew.cs

@@ -31155,6 +31155,26 @@ left Join JC_Shop b on a.Shopid = b.Shopid";
         }
         #endregion
 
+        #region 根据sku读temu订单
+        public static List<TemuSKUOrder> 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<TemuSKUOrder>();
+           
+        }
+        #endregion
     }
 }

TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx

@@ -122,6 +122,11 @@
             col.CellTemplate = "<span>{Bind LeftNumE}</span>";
             Array.add(datagrid1.Columns, col);
 
+            col = new nblf.ui.DataGridColumn();
+            col.HeaderText = "总库存";
+            col.CellTemplate = "<span>{Bind LeftNumAll}</span>";
+            Array.add(datagrid1.Columns, col);
+
             col = new nblf.ui.DataGridColumn();
             col.HeaderText = "库龄";
             col.CellTemplate = "<span>{Bind PositionAge}</span>";

TradeManageNew/ModelNew.cs

@@ -11360,4 +11360,25 @@ namespace TradeManageNew
         /// </summary>
         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; }
+    }
 }

TradeManageNew/bin/TradeManageNew.dll.config

@@ -63,11 +63,11 @@
     </scripting>
   </system.web.extensions>
   <appSettings>
-    <add key="ConnectionString" value="server=.;database=ERPYY;uid=sa;pwd=hz123456" />
+    <!--<add key="ConnectionString" value="server=.;database=ERPYY;uid=sa;pwd=hz123456" />-->
     <!--<add key="ConnectionString" value="server=101.37.88.86;database=erp;uid=sa;pwd=erp@yeyuan123456New"/>-->
     <!--<add key="ConnectionString" value="server=60.12.218.120;database=erp;uid=KJERP;pwd=KJERP123456"/>-->
     <!--<add key="ConnectionString" value="server=192.168.1.16;database=newerp;uid=erpadmin;pwd=erp@12345" />-->
-    <!--<add key="ConnectionString" value="server=192.168.1.16;database=newerpbak_cwk;uid=erpadmin;pwd=erp@12345;TrustServerCertificate=True;"/>-->
+    <add key="ConnectionString" value="server=192.168.1.16;database=newerpbak_cwk;uid=erpadmin;pwd=erp@12345;TrustServerCertificate=True;"/>
     <add key="PDAversion" value="1.0.1"/>
   </appSettings>
   <system.webServer>