1

TradeManageNew/DD_OrderServiceNew.asmx.cs

@@ -28752,6 +28752,8 @@ namespace TradeManageNew
                             CreatorId = pageItem.CreatorId,
                             PublishMessage = pageItem.PublishMessage,
                             TrackingCode= pageItem.TrackingCode,
+                            imgList=pageItem.imgList,
+                            outboundTrackCode = pageItem.outboundTrackCode,
                         };
                         result.DataSource.Add(resultItem);
                     }
@@ -30481,6 +30483,18 @@ namespace TradeManageNew
             return true;
         }
         #endregion
+        #region 编辑
+        [WebMethod(EnableSession = true)]
+        public int update_TemuShopGoodActive_Data(TemuShopGoodActive Model)
+        {
+            Pages.Login(this.Session);
+            Model.State = 1;
+            Model.CreateTime = DateTime.Now;
+            Model.CreateUserId = Convert.ToInt32(Session["UserId"]);
+            return DataNew.update_TemuShopGoodActive_Data(Model);
+        }
+        #endregion
+
         #region 结束活动
         [WebMethod(EnableSession = true)]
         public bool Update_TemuShopGoodActive(int ID)

TradeManageNew/DataNew.cs

@@ -31133,6 +31133,60 @@ select @ID";
             int a = Convert.ToInt32(db.ExecuteScalar(cmd));
             tsql = @"INSERT INTO [TemuShopGoodActiveDetail]([ActiveId],[OffNum],[SalePrice],[ActiveNum],[OutNum])values(@ActiveId,@OffNum,@SalePrice,@ActiveNum,@OutNum)";
             cmd = db.GetSqlStringCommand(tsql);
+            if (Model.ListModel!=null)
+            {
+                foreach (var item in Model.ListModel)
+                {
+                    cmd.Parameters.Clear();
+                    item.OutNum = 0;
+                    db.AddInParameter(cmd, "@ActiveId", DbType.Int32, a);
+                    db.AddInParameter(cmd, "@OffNum", DbType.Decimal, item.OffNum);
+                    db.AddInParameter(cmd, "@SalePrice", DbType.Decimal, item.SalePrice);
+                    db.AddInParameter(cmd, "@ActiveNum", DbType.Int32, item.ActiveNum);
+                    db.AddInParameter(cmd, "@OutNum", DbType.Int32, item.OutNum);
+                    db.ExecuteNonQuery(cmd);
+                }
+            }
+           
+            return a;
+        }
+        #endregion
+
+
+        #region 编辑TemuShopGoodActive
+        public static int update_TemuShopGoodActive_Data(TemuShopGoodActive Model)
+        {
+            string tsql = @"
+if @ID>0
+begin
+Update [TemuShopGoodActive] set [Shopid]=@Shopid,[SKU]=@SKU,[SPUID]=@SPUID,[BasePrice]=@BasePrice,[CreateUserId]=@CreateUserId,[CreateTime]=@CreateTime,[PostPrice]=@PostPrice,[State]=@State where ID=@ID
+end
+else
+select @ID";
+            Database db = DatabaseFactory.CreateDatabase();
+            DbCommand cmd = db.GetSqlStringCommand(tsql);
+            db.AddInParameter(cmd, "@ID", DbType.Int32, Model.ID);
+            db.AddInParameter(cmd, "@Shopid", DbType.Int32, Model.Shopid);
+            db.AddInParameter(cmd, "@SKU", DbType.String, Model.SKU);
+            db.AddInParameter(cmd, "@SPUID", DbType.String, Model.SPUID);
+            db.AddInParameter(cmd, "@BasePrice", DbType.Decimal, Model.BasePrice);
+            db.AddInParameter(cmd, "@CreateUserId", DbType.Int32, Model.CreateUserId);
+            db.AddInParameter(cmd, "@CreateTime", DbType.DateTime, Model.CreateTime);
+            db.AddInParameter(cmd, "@PostPrice", DbType.Decimal, Model.PostPrice);
+            db.AddInParameter(cmd, "@State", DbType.Int32, Model.State);
+            int a = Convert.ToInt32(db.ExecuteScalar(cmd));
+            tsql = @"
+if @Id>0
+begin
+Update [TemuShopGoodActiveDetail] set [ActiveId]=@ActiveId,[OffNum]=@OffNum,[SalePrice]=@SalePrice,[ActiveNum]=@ActiveNum,[OutNum]=@OutNum where Id=@Id
+end
+else
+begin
+INSERT INTO [TemuShopGoodActiveDetail]([ActiveId],[OffNum],[SalePrice],[ActiveNum],[OutNum])values(@ActiveId,@OffNum,@SalePrice,@ActiveNum,@OutNum)
+end";
+            cmd = db.GetSqlStringCommand(tsql);
+            if (Model.ListModel != null)
+            {
                 foreach (var item in Model.ListModel)
                 {
                     cmd.Parameters.Clear();
@@ -31142,8 +31196,11 @@ select @ID";
                     db.AddInParameter(cmd, "@SalePrice", DbType.Decimal, item.SalePrice);
                     db.AddInParameter(cmd, "@ActiveNum", DbType.Int32, item.ActiveNum);
                     db.AddInParameter(cmd, "@OutNum", DbType.Int32, item.OutNum);
+                    db.AddInParameter(cmd, "@Id", DbType.Int32, item.Id);
                     db.ExecuteNonQuery(cmd);
                 }
+            }
+
             return a;
         }
         #endregion

TradeManageNew/DingDan/DT_SecondHand2.aspx

@@ -1,6 +1,4 @@
-<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_OrderReturn.aspx.cs" Inherits="TradeManageNew.DingDan.DT_OrderReturn" %>
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DT_SecondHand2.aspx.cs" Inherits="TradeManageNew.DingDan.DT_SecondHand2" %>
-
-DingDan/DD_OrderListForTM2.aspx
 
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml">
@@ -102,10 +100,7 @@ DingDan/DD_OrderListForTM2.aspx
                 top: 0;
                 max-width: 100vw;
                 max-height: 100vh;
-                /* overflow: hidden; */
                 page-break-after: avoid;
-                /* display:flex;
-                justify-content:center; */
             }
             #printArea *{
                 position: absolute;
@@ -117,8 +112,6 @@ DingDan/DD_OrderListForTM2.aspx
     <script src="https://cdn.jsdelivr.net/npm/jsbarcode@3.11.5/dist/JsBarcode.all.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/file-saver@2.0.5/dist/FileSaver.min.js"></script>
-    <!-- <script src="https://cdnjs.cloudflare.com/ajax/libs/jQuery.print/1.6.2/jQuery.print.min.js" integrity="sha512-t3XNbzH2GEXeT9juLjifw/5ejswnjWWMMDxsdCg4+MmvrM+MwqGhxlWeFJ53xN/SBHPDnW0gXYvBx/afZZfGMQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
-    <script src="../Scripts/MicrosoftAjax.js" type="text/javascript"></script>
     <script src="../Scripts/jquery.min.js" type="text/javascript"></script>
     <script src="../Scripts/jquery.easyui.min.js" type="text/javascript"></script>
     <script src="../Scripts/DataGrid.js?a=3445" type="text/javascript"></script>
@@ -200,26 +193,6 @@ DingDan/DD_OrderListForTM2.aspx
                     'onComplete': function () {}
                 });
             });
-
-
-            $("#" + datagrid1.TableID + " [CommandName='outboundImg']").live("click", function () {
-                var RowIndex = $(this).parentsUntil("tr").parent().attr("index");
-                var model = datagrid1.Get_Model(RowIndex);
-                $("#img_1").attr("src", model.imgList[0]);
-                $("#div_img").empty();
-                model.imgList.forEach(pic => {
-                    $("#div_img").append("<img src='../" + pic + "' width='100px' height='80px'  style='margin-right:5px'/>");
-                })
-                $.fancybox({
-                    'width': '40%',
-                    'height': '40%',
-                    'autoScale': false,
-                    'transitionIn': 'elastic',
-                    'transitionOut': 'elastic',
-                    'href': '#test3',
-                    'onComplete': function () { }
-                });
-            });
         });
 
         // 初始化DataGrid
@@ -287,10 +260,6 @@ DingDan/DD_OrderListForTM2.aspx
                         return "等待取货";
                     case 4: 
                         return "售卖完成";
-                    case 5:
-                        return "使用配件";
-                    case 6:
-                        return "现场出售";
                     default:
                         return "-";
                 }
@@ -329,19 +298,6 @@ DingDan/DD_OrderListForTM2.aspx
             }
             Array.add(datagrid1.Columns, col);
 
-            col = new nblf.ui.DataGridColumn();
-            col.HeaderText = "Outbound Photo";
-            col.CellTemplate = `{Bind orginData}`;
-            col.CellFormatter = function (data) {
-                var imgList = data.imgList
-                if (imgList.length) {
-                    return `<a CommandName='outboundImg' iul='${imgList[0]}'><img src='${imgList[0]}' alt='' width='50px' height='50px'/></a>`
-                } else {
-                    return ''
-                }
-            }
-            Array.add(datagrid1.Columns, col);
-
             //操作
             col = new nblf.ui.DataGridColumn();
             col.HeaderText = "操作";
@@ -412,16 +368,15 @@ DingDan/DD_OrderListForTM2.aspx
             $.ajax({
                 url: "../DD_OrderServiceNew.asmx/OrderUsedSalePlatformPage",
                 data: Sys.Serialization.JavaScriptSerializer.serialize(param),
-                success: function (res) {
+                success: function (data) {
                     WindowLoadModel.Hide();
-                    data = res.d.DataSource ? res.d.DataSource : []
+                    data.d.DataSource = data.d.DataSource ? data.d.DataSource : []
-                    data.forEach(it=>{
+                    data.d.DataSource.forEach(it=>{
-                        it.firstImg = it.ImageUrls && it.ImageUrls.length ? it.ImageUrls[0] : ""
-                        it.imgList = it.imgList ? it.imgList.split(',') : []
                         it.orginData = JSON.parse(JSON.stringify(it))
+                        it.firstImg = it.ImageUrls && it.ImageUrls.length ? it.ImageUrls[0] : ""
                     })
-                    datagrid1.Set_RowCount(res.d.RowCount);
+                    datagrid1.Set_RowCount(data.d.RowCount);
-                    datagrid1.DataBind(data);
+                    datagrid1.DataBind(data.d.DataSource);
                     $("#a_select").html("");
                     $("a[iul]").each(function () {
                         var iul = $(this).attr("iul");
@@ -886,8 +841,6 @@ DingDan/DD_OrderListForTM2.aspx
                      <option value="2">已上架</option>
                      <option value="3">等待取货</option>
                      <option value="4">售卖完成</option>
-                     <option value="5">使用配件</option>
-                     <option value="6">现场出售</option>
                 </select>
             </td>
             <td>

TradeManageNew/HuoWuServiceNew.asmx.cs

@@ -23,6 +23,7 @@ using System.Web.UI;
 using System.Text;
 using NPOI.HSSF.Model;
 
+
 namespace TradeManageNew
 {
     /// <summary>
@@ -7385,6 +7386,216 @@ 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 (string.IsNullOrEmpty(error) == false)
+        //        {
+        //            rmodel.Code = 0;
+        //            rmodel.Message = error;
+        //        }
+        //        var data = new List<TemuShopGoodActive>();
+        //        StringBuilder sb = new StringBuilder();
+
+        //        var shopName = tb.Rows[1]["店铺名"].ToString();
+        //        if (string.IsNullOrEmpty(shopName))
+        //        {
+        //            sb.Append("第" + (2).ToString() + "行店铺名不能为空；");
+
+        //        }
+        //        var shop = DataNew.GetShopByShopName(shopName);
+        //        if (shop == null)
+        //        {
+        //            sb.Append("第" + (2).ToString() + "行店铺名:" + shopName + "不存在；");
+        //        }
+
+        //        var sku = tb.Rows[1]["SKU"].ToString();
+        //        if (string.IsNullOrEmpty(sku))
+        //        {
+        //            sb.Append("第" + (2).ToString() + "行SKU不能为空；");
+        //        }
+        //        var SKUID = tb.Rows[1]["SKUID"].ToString();
+        //        if (string.IsNullOrEmpty(SKUID))
+        //        {
+        //            sb.Append("第" + (2).ToString() + "行SKUID不能为空；");
+        //        }
+
+        //        if (string.IsNullOrEmpty(tb.Rows[1]["价格"].ToString()))
+        //        {
+        //            sb.Append("第" + (2).ToString() + "行价格不能为空；");
+        //        }
+
+        //        if (string.IsNullOrEmpty(tb.Rows[1]["折扣"].ToString()))
+        //        {
+        //            sb.Append("第" + (2).ToString() + "行折扣不能为空；");
+        //        }
+        //        if (string.IsNullOrEmpty(tb.Rows[1]["售价"].ToString()))
+        //        {
+        //            sb.Append("第" + (2).ToString() + "行售价不能为空；");
+        //        }
+        //        if (string.IsNullOrEmpty(tb.Rows[1]["数量"].ToString()))
+        //        {
+        //            sb.Append("第" + (2).ToString() + "行数量不能为空；");
+        //        }
+
+        //        var md = new TemuShopGoodActive()
+        //        {
+        //            Shopid = shop.ShopId.Value,
+        //            SPUID = SKUID,
+        //            SKU = sku,
+        //            BasePrice = Convert.ToDecimal(tb.Rows[1]["价格"].ToString()),
+        //            CreateUserId = userid,
+        //            CreateTime = DateTime.Now,
+        //            State = 1,
+        //        };
+        //        var mddetail = new TemuShopGoodActiveDetail()
+        //        {
+        //            OffNum = Convert.ToDecimal(tb.Rows[1]["折扣"].ToString()),
+        //            SalePrice = Convert.ToDecimal(tb.Rows[1]["售价"].ToString()),
+        //            ActiveNum= Convert.ToInt32(tb.Rows[1]["数量"].ToString()),
+        //        };
+        //        md.ListModel.Add(mddetail);
+        //        //md.ListModel
+        //        data.Add(md);
+
+        //        for (int i = 2; i < tb.Rows.Count; i++)
+        //        {
+        //            int shopid2 = 0;
+        //            var shopName2 = tb.Rows[i]["店铺名"].ToString();
+        //            var sku2 = tb.Rows[i]["SKU"].ToString();
+        //            var SKUID2 = tb.Rows[i]["SKUID"].ToString();
+        //            var price2 = tb.Rows[i]["价格"].ToString();
+        //            var shopNamei = tb.Rows[i-1]["店铺名"].ToString();
+        //            var skui = tb.Rows[i-1]["SKU"].ToString();
+        //            var SKUIDi = tb.Rows[i-1]["SKUID"].ToString();
+        //            var shopi = DataNew.GetShopByShopName(shopNamei);
+        //            var md2 = new TemuShopGoodActive();
+                   
+        //            if (string.IsNullOrEmpty(shopName2)&& string.IsNullOrEmpty(sku2) && string.IsNullOrEmpty(sku2) )
+        //            {
+
+        //                md2 = data.Where(p => p.Shopid == shopi.ShopId.Value&&p.SKU== skui&&p.SPUID== SKUIDi).FirstOrDefault();
+        //            }
+
+
+        //            if (string.IsNullOrEmpty(shopName2))
+        //            {
+        //                var shop2 = DataNew.GetShopByShopName(shopNamei);
+        //                tb.Rows[i]["店铺名"] = shopNamei;
+        //                shopName2 = tb.Rows[i]["店铺名"].ToString();
+
+        //                if (shop2 != null)
+        //                {
+        //                    shopid2 = shop2.ShopId.Value;
+        //                }
+        //                else
+        //                {
+        //                    sb.Append("第" + (i - 1).ToString() + "行店铺名:" + shopName2 + "不存在；");
+        //                }
+        //            }
+        //            else 
+        //            {
+        //                shopid2 = DataNew.GetShopByShopName(shopName2).ShopId.Value;
+        //            }
+        //            if (string.IsNullOrEmpty(sku2))
+        //            {
+        //                tb.Rows[i]["SKU"] = tb.Rows[i - 1]["SKU"];
+        //                sku2 = tb.Rows[i]["SKU"].ToString();
+        //            }
+        //            if (string.IsNullOrEmpty(SKUID2))
+        //            {
+        //                tb.Rows[i]["SKUID"] = tb.Rows[i - 1]["SKUID"];
+        //                SKUID2 = tb.Rows[i]["SKUID"].ToString();
+        //            }
+        //            if (string.IsNullOrEmpty(price2))
+        //            {
+        //                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 (string.IsNullOrEmpty(tb.Rows[i]["数量"].ToString()))
+        //            {
+        //                sb.Append("第" + (i + 1).ToString() + "行数量不能为空；");
+        //            }
+        //            var exdata = DataNew.GetTemuShopGoodPrice(shop.ShopId.Value, sku, SKUID);
+        //            //if (exdata != null)
+        //            //{
+        //            //    sb.Append("第" + (i + 1).ToString() + "行已存在相同数据；");
+        //            //    continue;
+        //            //}
+        //            if (md2==null)
+        //            {
+        //                md2.Shopid = shopid2;
+        //                md2.SKU = sku2;
+        //                md2.SPUID = SKUID2;
+        //                md2.BasePrice = Convert.ToDecimal(price2);
+        //                md2.CreateUserId = userid;
+        //                md2.CreateTime = DateTime.Now;
+        //                md2.State = 1;
+        //            }
+                   
+        //            var mddetail2 = new TemuShopGoodActiveDetail()
+        //            {
+        //                OffNum = Convert.ToDecimal(tb.Rows[i]["折扣"].ToString()),
+        //                SalePrice = Convert.ToDecimal(tb.Rows[i]["售价"].ToString()),
+        //                ActiveNum = Convert.ToInt32(tb.Rows[i]["数量"].ToString()),
+        //            };
+        //            md2.ListModel.Add(mddetail);
+
+        //            data.Add(md);
+        //        }
+
+        //        if (sb.Length > 0)
+        //        {
+        //            rmodel.Code = 0;
+        //            rmodel.Message = sb.ToString();
+        //            return rmodel;
+        //        }
+
+        //        foreach (var i in data)
+        //        {
+        //            DataNew.Save_TemuShopGoodActive(i);
+        //        }
+
+        //        rmodel.Code = 1;
+        //        rmodel.Message = "";
+        //        return rmodel;
+        //    }
+        //    catch (Exception ex)
+        //    {
+        //        rmodel.Code = 0;
+        //        rmodel.Message = ex.Message;
+        //        return rmodel;
+        //    }
+        //}
+
+
+
 
         [WebMethod(EnableSession = true)]
         public APIReturnModel DeleteTemuShopGoodPrice(int id)

TradeManageNew/Huowu/HW_GoodsDetailList2TemuSku.aspx

@@ -294,7 +294,7 @@
             var YYUserList = [];
             function GetYYUser() {
                 var param = new Object();
-                param.isShowAllGroup = 1;
+                param.isShowAllGroup = 0;
                 $.ajax({
                     url: "../CangKuServerNew.asmx/GetList_YYUser",
                     data: Sys.Serialization.JavaScriptSerializer.serialize(param),

TradeManageNew/Huowu/TemuShopGoodPriceNew.aspx

@@ -36,7 +36,6 @@
             var datagrid2 = new nblf.ui.DataGrid("DataGrid2");
             var WindowLoadModel = new WindowLoad();
             var Model = null;
-            var EditType = 'add'
             $(document).ready(function () {
                 WindowLoadModel.ApplicationPath = "../";
                 WindowLoadModel.Load();
@@ -56,7 +55,6 @@
                 ReadData();
 
                 $("#cmdAdd").click(function () {
-                    EditType = 'add'
                     Model = new Object();
                     Model.ID = 0;
                     Model.ListModel = new Array();
@@ -66,7 +64,6 @@
                     //$("#txtInDate").val(CurrentDate.localeFormat("yyyy-MM-dd"));
                     //  $("#SelectHtml").hide();
                     ShowFancybox("MainTable");
-                    Model.ID = 0;
                 });
 
                 $("#cmdGet").click(function () {
@@ -99,13 +96,11 @@
                     var index = $(this).parentsUntil("tr").parent().attr("index");
                     Model = datagrid1.Get_Model(index);
                     if(CommandName == "cmdEdit"){
-                        EditType = 'edit'
                         GetModel(Model.ID);
                         datagrid2.DataBind(Model.ListModel);
                         ShowFancybox("MainTable");
                     }
                     if (CommandName == "cmdCopy") {
-                        EditType = 'copy'
                         //有审核时用
                         //if (Model.State == 1 || Model.State == 2) { $("#cmdSave").hide(); }
                         //else { $("#cmdSave").show(); }
@@ -119,7 +114,6 @@
                         //$("#txtInDate").val(CurrentDate.localeFormat("yyyy-MM-dd"));
                         //  $("#SelectHtml").hide();
                         ShowFancybox("MainTable");
-                        Model.ID = 0;
                     }
                     if (CommandName == "cmdDel") {
                         Delete(Model.ID);
@@ -205,7 +199,7 @@
                 Array.add(datagrid1.Columns, col);
 
                 col = new nblf.ui.DataGridColumn();
-                col.HeaderText = "SKUID";
+                col.HeaderText = "SPUID";
                 col.CellTemplate = "<span>{Bind SPUID}</span>";
                 Array.add(datagrid1.Columns, col);
 
@@ -247,8 +241,7 @@
                 col = new nblf.ui.DataGridColumn();
                 col.HeaderText = "操作";
                 col.Width = "160px";
-                // col.CellTemplate = "<span CommandName='cmdEdit' style='color: #0000FF;cursor:pointer;text-decoration: underline;'>编辑</span>&nbsp;&nbsp;<span CommandName='cmdCopy' style='color: #0000FF;cursor:pointer;text-decoration: underline;'>复制</span>&nbsp;&nbsp;<span CommandName='cmdDel' style='color: #0000FF;cursor:pointer;text-decoration: underline;'>结束活动</span>";
+                col.CellTemplate = "<span CommandName='cmdEdit' style='color: #0000FF;cursor:pointer;text-decoration: underline;'>编辑</span>&nbsp;&nbsp;<span CommandName='cmdCopy' style='color: #0000FF;cursor:pointer;text-decoration: underline;'>复制</span>&nbsp;&nbsp;<span CommandName='cmdDel' style='color: #0000FF;cursor:pointer;text-decoration: underline;'>结束活动</span>";
-                col.CellTemplate = "<span CommandName='cmdCopy' style='color: #0000FF;cursor:pointer;text-decoration: underline;'>复制</span>&nbsp;&nbsp;<span CommandName='cmdDel' style='color: #0000FF;cursor:pointer;text-decoration: underline;'>结束活动</span>";
                 Array.add(datagrid1.Columns, col);
 
                 //datagrid1.SetPageSize(20);
@@ -331,6 +324,7 @@
                     success: function (data) {
                         if (data.d == null) return;
                         Model = data.d;
+                        Model.ID = 0;
                         CreateGetModel("MainTable", Model);
                         $("#select_shops").val(Model.Shopid);
                         datagrid2.DataBind(Model.ListModel);
@@ -371,9 +365,8 @@
                 param.Model = Model;
                 param.Model.ListModel = datagrid2.DataSource
                 WindowLoadModel.Show();
-                if(EditType == 'edit'){
                 $.ajax({
-                        url: "../DD_OrderServiceNew.asmx/update_TemuShopGoodActive",
+                    url: "../DD_OrderServiceNew.asmx/Save_TemuShopGoodActive",
                     data: Sys.Serialization.JavaScriptSerializer.serialize(param),
                     success: function (data) {
                         WindowLoadModel.Hide();
@@ -382,9 +375,27 @@
                         $.fancybox.close();
                     }
                 });
-                }else{
+            }
+            //#endregion
+
+
+            //#region 编辑
+            function Update() {
+                if ($("#select_shops").val() == "-1") {
+                    alert("请选择店铺");
+                    return;
+                }
+                var error = CreateSaveModel("MainTable", Model);
+                if (error != "") { alert(error); return; }
+                Model.ShopId = $("#select_shops").val();
+                error = datagrid2.UpdateDataSource();
+                if (error != "") { alert(error); return; }
+                var param = new Object();
+                param.Model = Model;
+                param.Model.ListModel = datagrid2.DataSource
+                WindowLoadModel.Show();
                 $.ajax({
-                        url: "../DD_OrderServiceNew.asmx/Save_TemuShopGoodActive",
+                    url: "../DD_OrderServiceNew.asmx/update_TemuShopGoodActive",
                     data: Sys.Serialization.JavaScriptSerializer.serialize(param),
                     success: function (data) {
                         WindowLoadModel.Hide();
@@ -394,8 +405,8 @@
                     }
                 });
             }
-            }
             //#endregion
+
             //#region 显示弹出窗体
             function ShowFancybox(id) {
                 $.fancybox({
@@ -524,7 +535,7 @@
                         <td class="f1">SKU</td>
                         <td><input id='txtSKU' type='text' style='width: 99%' columnname="SKU" columndesc="SKU"
                                 columnrequired="true" validtype="" /></td>
-                        <td class="f1">SKUID</td>
+                        <td class="f1">SPUID</td>
                         <td><input id='txtSPUID' type='text' style='width: 99%' columnname="SPUID" columndesc="SPUID"
                                 columnrequired="false" validtype="" /></td>
 

TradeManageNew/Models/Shage/SelfPickupOrderUsedSalePlatformInput.cs

@@ -7,5 +7,11 @@ namespace TradeManageNew.Models.Shage
         public List<int> Ids { get; set; }
         
         public int UserId { get; set; }
+
+        public int Status { get; set; }
+
+        public string imgList { get; set; }
+
+        public string outboundTrackCode { get; set; }
     }
 }

TradeManageNew/Models/ShopifyUsedSale/OrderUsedSalePlatformPageDto.cs

@@ -107,5 +107,13 @@ namespace TradeManageNew.Models.ShopifyUsedSale
         /// TrackingCode
         /// </summary>
         public string TrackingCode { get; set; }
+        /// <summary>
+        /// imgList
+        /// </summary>
+        public string imgList { get; set; }
+        /// <summary>
+        /// outboundTrackCode
+        /// </summary>
+        public string outboundTrackCode { get; set; }
     }
 }

TradeManageNew/OuterService/ShageService.ashx.cs

@@ -2025,6 +2025,8 @@ namespace TradeManageNew.OuterService
                                     .Set(x => x.Status, UsedSalePlatformStatus.Sold)
                                     .Set(x => x.LastModifierId, input.UserId)
                                     .Set(x => x.LastModificationTime, DateTime.Now)
+                                    .Set(x => x.imgList, input.imgList)
+                                    .Set(x => x.outboundTrackCode, input.outboundTrackCode)
                                     .Update();
                             }
                         }

TradeUsedSale/Repositories/Models/DT_OrderUsedSalePlatform.cs

@@ -117,5 +117,14 @@ namespace TradeUsedSale.Repositories.Models
         /// 运费
         /// </summary>
         public decimal TotalNetCharge { get; set; }
+
+        /// <summary>
+        /// imgList
+        /// </summary>
+        public string imgList { get; set; }
+        /// <summary>
+        /// outboundTrackCode
+        /// </summary>
+        public string outboundTrackCode { get; set; }
     }
 }