定向类目显示优化

AllBase/BaseClass.cs

@@ -31,7 +31,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 1278;
+        public static int VersionCount = 1279;
         public static string MainPath = "29wx";
         //public static string MainPath = "29wx";
         //public static string MainPath = "29pdd";

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs

@@ -1,22 +1,23 @@
-using AllBase.Helper;
+using AllBase;
+using AllBase.Helper;
 using AllBase.Model.Result;
-using TemuKJD.BaseForms;
+using AllBase.Model.Result.PDDResult;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using AllBase;
-using Work;
-using TemuKJD.ToolForms;
-using Newtonsoft.Json.Linq;
-using System.IO;
-using Work.BLL.Tools;
+using TemuKJD.BaseForms;
 using TemuKJD.BLL;
+using TemuKJD.ToolForms;
+using Work;
+using Work.BLL.Tools;
 
 namespace TemuKJD.PDDForms.ProductSelectForms
 {
@@ -51,7 +52,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 {
                     var prodTmp = GetPddProductDetail(dbProd.id.ToString());
                     if (prodTmp != null)
+                    {
                         dbProd = prodTmp;
+                        GetCanEdit();
+                        //var prodInfo = JsonHelper.DeserializeJsonToObject<PDDProductInfo>(dbProd.product_json);
+                        //if (prodInfo.detail.galleries.Any(g => g.type == 6))
+                        //{
+
+                        //}
+                    }
                 }
             }
         }
@@ -145,7 +154,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms
 
         private void btnEditDetail_Click(object sender, EventArgs e)
         {
-            bool canEdit = true;
+            PDDDBProdEditDetailForm editDetailForm = new PDDDBProdEditDetailForm(this.dbProd);
+            if (!canEdit)
+            {
+                editDetailForm.btnRestoreAll.Visible = false;
+                editDetailForm.btnSaveSkuLst.Visible = false;
+            }
+            editDetailForm.ShowDialog();
+        }
+
+        bool canEdit = false;
+        private bool GetCanEdit ()
+        {
+            canEdit = true;
             //{"goodsId":"2032007952082477057","warehouseGoodsId":"171C2881E8C6491CA65728683483EDE9","spuCode":"987651321321","skus":[{"skuId":"2032007952837451777","warehouseSkuId":"6B710CE261B240C38B5245006F3622A3","skuCode":"20190311002"},{"skuId":"2032007953839890434","warehouseSkuId":"2FA14AAB600541CAA72DDE7697D8D27A","skuCode":"201607090622"}]}
             if (dbProd.product_get_type_text == "厂商直采")
             {
@@ -155,7 +176,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 if (!string.IsNullOrEmpty(convertRst))
                 {
                     BaseMsgForm.ShowError("商品结构获取失败 " + convertRst);
-                    return;
+                    return false;
                 }
                 //string exportData = dbProd.product_json;
                 //var address = Path.Combine("D:\\", dbProd.spu_id + ".txt");
@@ -172,7 +193,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 if (!string.IsNullOrEmpty(convertRst))
                 {
                     BaseMsgForm.ShowError("商品结构获取失败");
-                    return;
+                    return false;
                 }
             }
             if (dbProd.product_get_type_text == "1688厂家")
@@ -183,17 +204,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 if (!string.IsNullOrEmpty(convertRst))
                 {
                     BaseMsgForm.ShowError("商品结构获取失败");
-                    return;
+                    return false;
                 }
             }
             if (dbProd.product_get_type_text == "1688外部数据")
             {
+                canEdit = true;
                 string convertRst = "";
                 var pInfo = new PDDProdFormConverter()._1688OutToPddConvert(out convertRst, dbProd);
                 if (!string.IsNullOrEmpty(convertRst))
                 {
                     BaseMsgForm.ShowError("商品结构获取失败");
-                    return;
+                    return false;
                 }
             }
             #region 微信小店app
@@ -205,18 +227,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 if (!string.IsNullOrEmpty(convertRst))
                 {
                     BaseMsgForm.ShowError("商品结构获取失败");
-                    return;
+                    return false;
                 }
             }
             #endregion
-
-            PDDDBProdEditDetailForm editDetailForm = new PDDDBProdEditDetailForm(this.dbProd);
-            if (!canEdit)
-            {
-                editDetailForm.btnRestoreAll.Visible = false;
-                editDetailForm.btnSaveSkuLst.Visible = false;
-            }
-            editDetailForm.ShowDialog();
+            return canEdit;
         }
     }
 }

TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs

@@ -1201,21 +1201,17 @@ namespace TemuKJD.WXForms.ProductForms
             this.label40.Location = new System.Drawing.Point(7, 15);
             this.label40.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label40.Name = "label40";
-            this.label40.Size = new System.Drawing.Size(80, 17);
+            this.label40.Size = new System.Drawing.Size(56, 17);
             this.label40.TabIndex = 825;
-            this.label40.Text = "国表品类品牌";
+            this.label40.Text = "定向品牌";
             // 
             // cmbSpBrandName
             // 
             this.cmbSpBrandName.FormattingEnabled = true;
-            this.cmbSpBrandName.Items.AddRange(new object[] {
-            "",
-            "名圣"});
-            this.cmbSpBrandName.Location = new System.Drawing.Point(87, 11);
+            this.cmbSpBrandName.Location = new System.Drawing.Point(63, 11);
             this.cmbSpBrandName.Name = "cmbSpBrandName";
-            this.cmbSpBrandName.Size = new System.Drawing.Size(92, 25);
+            this.cmbSpBrandName.Size = new System.Drawing.Size(105, 25);
             this.cmbSpBrandName.TabIndex = 824;
-            this.cmbSpBrandName.Text = "名圣";
             // 
             // 佣金上货
             //