diff --git a/TradeManage/bin/TradeManageNew.dll b/TradeManage/bin/TradeManageNew.dll
index 0b01a2d..d26a6b3 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 f89535b..0056991 100644
--- a/TradeManageNew/DataNew.cs
+++ b/TradeManageNew/DataNew.cs
@@ -7245,8 +7245,8 @@ inner join DT_OrderGoods g on a.OrderId=g.OrderId
 inner join HW_GoodsDetail e on g.DetailId=e.DetailId
 left Join DT_Fees b with(nolock) on a.OrderId=b.orderid
 where a.State>0 and c.StoreId in (6,9,11)   and  a.State<3 and a.PlatId=23)t group by GoodsId)  Gr on a.GoodsId=Gr.GoodsId
-) t
-where 1=1   " + sqlPage + where + " order by GoodsHJNum desc ";
+ where 1=1 "+ where + @") t
+where 1=1   " + sqlPage  + " order by GoodsHJNum desc ";
             Database db = DatabaseFactory.CreateDatabase();
             DbCommand cmd = db.GetSqlStringCommand(tsql);
 
@@ -31213,14 +31213,14 @@ left Join JC_Shop b on a.Shopid = b.Shopid";
         {
 
             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
+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,a.GoodsNum 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";
+where c.SKU1=@SKU";
             Database db = DatabaseFactory.CreateDatabase();
             DbCommand cmd = db.GetSqlStringCommand(tsql);
             db.AddInParameter(cmd, "@SKU", DbType.String, SKU);
diff --git a/TradeManageNew/HuoWuServiceNew.asmx.cs b/TradeManageNew/HuoWuServiceNew.asmx.cs
index 28836c2..d92eb13 100644
--- a/TradeManageNew/HuoWuServiceNew.asmx.cs
+++ b/TradeManageNew/HuoWuServiceNew.asmx.cs
@@ -7688,9 +7688,47 @@ namespace TradeManageNew
         {
             PagesNew.Login(this.Session);
             var datas = DataNew.GetTemuOrderFromSKU(sku);
-
+            if (datas != null&& datas.Count>0)
+            {
+                TemuSKUOrder amd = new TemuSKUOrder();
+                decimal TotalPrice = 0;
+                decimal yj = 0;
+                decimal ck = 0;
+                decimal sjtc = 0;
+                decimal sjyf = 0;
+                decimal cb = 0;
+                decimal hwsf = 0;
+                decimal lr = 0;
+                int num = 0;
+                foreach (var md in datas)
+                {
+                    md.InDate2 = md.InDate.Value.ToString("yyy-MM-dd");
+                    TotalPrice += md.TotalPrice.Value;
+                    yj += md.yj.Value;
+                    ck += md.ck.Value;
+                    sjtc += md.sjtc.Value;
+                    sjyf += md.sjyf.Value;
+                    cb += md.cb.Value;
+                    hwsf += md.hwsf.Value;
+                    lr += md.lr.Value;
+                    num += md.GoodsNum.Value;
+                }
+                amd.SKU1 = "合计：";
+                amd.TotalPrice = TotalPrice;
+                amd.yj = yj;
+                amd.ck = ck;
+                amd.sjtc = sjtc;
+                amd.sjyf = sjyf;
+                amd.cb = cb;
+                amd.lr = lr;
+                amd.KCNum = datas[0].KCNum;
+                amd.GoodsNum = num;
+                datas.Insert(0,amd);
+            }
             return datas;
-        }
+
+
+    }
 
     }
 
diff --git a/TradeManageNew/Huowu/TemuOrderGoodsFee.aspx b/TradeManageNew/Huowu/TemuOrderGoodsFee.aspx
index d66484b..cddec49 100644
--- a/TradeManageNew/Huowu/TemuOrderGoodsFee.aspx
+++ b/TradeManageNew/Huowu/TemuOrderGoodsFee.aspx
@@ -30,8 +30,7 @@
     <script src="../Scripts/DatePicker/WdatePicker.js" type="text/javascript"></script>
     <script src="../Scripts/MaskedTextBox.js" type="text/javascript"></script>
     <script type="text/javascript">
-        var Name = '<%= Session["Name"].ToString() %>';
-           var UserId = '<%= Session["UserId"].ToString() %>';
+       
         var datagrid1 = new nblf.ui.DataGrid("DataGrid1");
    
         var WindowLoadModel = new WindowLoad();
@@ -41,34 +40,9 @@
             WindowLoadModel.Load();
             ajaxInit(WindowLoadModel);
             CreateDataGrid();
-            ReadGroup();
-            ReadUser();
+           
             ReadData();
-            $("#select_groupname").bind("change", function () {
-                ReadUser();
-                      ReadData();
-            });
-               $("#" + datagrid1.TableID + " a[CommandName='dgbtnKC']").live("click", function () {
-                var RowIndex = $(this).parentsUntil("tr").parent().attr("index");
-                var model = datagrid1.Get_Model(RowIndex);
-                   var DId = model.Id;
-                   $("#txt_OutDays2").val(model.OutDays2);
-                   $("#txt_Price").val(model.Price);
-                   $("#txt_Price2").val(model.Price2);
-                   $("#txt_Num").val(model.Num);
-                   $("#txt_Price3").val(model.Price3);
-                   $("#txt_Num2").val(model.Num2);
-                      $("#txt_Price4").val(model.Price4);
-                   $("#txt_PlanInfo").val(model.PlanInfo);
-                   $("#txt_AdviseInfo").val(model.AdviseInfo);
-                      $("#txt_Remark").val(model.Remark);
-                   fopen();
-                   Model = model;
-                   var snames = model.ShopNames;
-
-                 
-                   ReadShopList(snames);
-            });
+           
         });
           
 
@@ -120,12 +94,8 @@
 
         //#region 初始化DataGrid
         function CreateDataGrid() {
-            Array.clear(datagrid1.Columns);
-            var col = new nblf.ui.DataGridColumn();
-            col.HeaderText = "SKU";
-            col.CellTemplate = "<a>{Bind SKU1}</a>";
-            Array.add(datagrid1.Columns, col);
-
+     
+          
             col = new nblf.ui.DataGridColumn();
             col.HeaderText = "店铺";
             col.Width = "150px";
@@ -137,10 +107,20 @@
                 col.HeaderText = "订单号";
             col.CellTemplate = "<a>{Bind PlatOrderCode}</a>";
                 // col.SortExpression = "b.GoodsInNum";
-                Array.add(datagrid1.Columns, col);
+            Array.add(datagrid1.Columns, col);
+            var col = new nblf.ui.DataGridColumn();
+            col.HeaderText = "SKU";
+            col.CellTemplate = "<a>{Bind SKU1}</a>";
+            Array.add(datagrid1.Columns, col);
+
+            col = new nblf.ui.DataGridColumn();
+            col.HeaderText = "数量";
+            col.CellTemplate = "<a>{Bind GoodsNum}</a>";
+            // col.SortExpression = "b.GoodsInNum";
+            Array.add(datagrid1.Columns, col);
               col = new nblf.ui.DataGridColumn();
                 col.HeaderText = "订单日期";
-            col.CellTemplate = "<div>{Bind InDate}</div>";
+            col.CellTemplate = "<div>{Bind InDate2}</div>";
                 // col.SortExpression = "b.GoodsInNum";
                 Array.add(datagrid1.Columns, col);
               
@@ -230,7 +210,8 @@
       
    
         function ReadData() {
-           
+            if ($("#txt_Name").val() == "")
+                return;
             var param = new Object();
             param.sku = $("#txt_Name").val();
             WindowLoadModel.Show();
@@ -240,7 +221,15 @@
                 success: function (data) {
                     WindowLoadModel.Hide();
                     datagrid1.DataBind(data.d);
-                   
+                    if (data.d != null) {
+
+                        $("#a_zsl").html(data.d[0].KCNum + data.d[0].GoodsNum);
+                        $("#a_yssl").html(data.d[0].GoodsNum);
+                        $("#a_sysl").html(data.d[0].KCNum);
+                        $("#a_zlr").html(data.d[0].lr);
+
+
+                    }
                 }
             });
         }
@@ -266,7 +255,7 @@
     
        <tr>
             <td colspan="2">
-              总数量：<a id="a_zsl"></a> 已售数量：<a id="a_yssl"></a> 剩余数量：<a id="a_sysl"></a> 总利润：<a id="a_zlr"></a>
+              总数量：<a id="a_zsl" style="color:blue;font-size:12pt">0</a>&nbsp; 已售数量：<a id="a_yssl" style="color:blue;font-size:12pt">0</a>&nbsp; 剩余数量：<a id="a_sysl" style="color:blue;font-size:12pt">0</a>&nbsp; 总利润：<a id="a_zlr" style="color:red;font-size:12pt">0</a>
             </td>
             
           
diff --git a/TradeManageNew/ModelNew.cs b/TradeManageNew/ModelNew.cs
index 748ecde..9c37259 100644
--- a/TradeManageNew/ModelNew.cs
+++ b/TradeManageNew/ModelNew.cs
@@ -11377,10 +11377,12 @@ namespace TradeManageNew
         public String ShopName { get; set; }
         public String PlatOrderCode { get; set; }
         public String SKU1 { get; set; }
-      
+        public String sku { get; set; }
+        public Int32? GoodsNum { get; set; }
         public Int32? WestNum { get; set; }
         public Int32? EastNum { get; set; }
         public Int32? KCNum { get; set; }
+        public String InDate2 { get; set; }
         public DateTime? InDate { get; set; }
         public Decimal? lr { get; set; }
 
diff --git a/TradeManageNew/Web.config b/TradeManageNew/Web.config
index 66850e4..4b0b07e 100644
--- a/TradeManageNew/Web.config
+++ b/TradeManageNew/Web.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>
diff --git a/TradeManageNew/bin/TradeManageNew.dll b/TradeManageNew/bin/TradeManageNew.dll
index 26ac797..d5c2d2b 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 66850e4..4b0b07e 100644
--- a/TradeManageNew/bin/TradeManageNew.dll.config
+++ b/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>
diff --git a/TradeManageNew/bin/TradeManageNew.pdb b/TradeManageNew/bin/TradeManageNew.pdb
index 4e503ef..cba6964 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 26ac797..d5c2d2b 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 4e503ef..cba6964 100644
Binary files a/TradeManageNew/obj/Debug/TradeManageNew.pdb and b/TradeManageNew/obj/Debug/TradeManageNew.pdb differ