diff --git a/AllBase/AllBase.csproj b/AllBase/AllBase.csproj
index b2764c0..d8a13b6 100644
--- a/AllBase/AllBase.csproj
+++ b/AllBase/AllBase.csproj
@@ -221,6 +221,7 @@
     <Compile Include="Model\Result\PDDResult\PddBuyerOrderInfoLite.cs" />
     <Compile Include="Model\Result\PDDResult\PddCatInfo.cs" />
     <Compile Include="Model\Result\PDDResult\PddClientInfo.cs" />
+    <Compile Include="Model\Result\PDDResult\PDDFrontProductInfo2.cs" />
     <Compile Include="Model\Result\VDianShopLoginInfo.cs" />
     <Compile Include="Model\Result\WXResult\DSRShopScoreInfo.cs" />
     <Compile Include="Model\Result\WXResult\WxActivityData.cs" />
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index c995425..9a6fbb4 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 1125;
+        public static int VersionCount = 1128;
         public static string MainPath = "29wx";
         //public static string MainPath = "29wx";
         //public static string MainPath = "29pdd";
diff --git a/AllBase/Model/Result/PDDResult/PDDFrontProductInfo2.cs b/AllBase/Model/Result/PDDResult/PDDFrontProductInfo2.cs
new file mode 100644
index 0000000..ca213be
--- /dev/null
+++ b/AllBase/Model/Result/PDDResult/PDDFrontProductInfo2.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.Result.PDDResult
+{
+    public class PDDFrontProductInfo2
+    {
+        public long? server_time { get; set; } // 1780124019,
+        public string destination_url { get; set; } // "order_checkout.html",
+        public int? destination_type { get; set; } // 2,
+        public string pre_render_url { get; set; } // "csr/comm_mall_home_pre_render.html",
+        public PDDFrontProductInfo2_goods goods { get; set; }
+        public List<PDDFrontProductInfo2_sku> sku { get; set; }
+        public PDDFrontProductInfo2_price price { get; set; }
+        public PDDFrontProductInfo2_mall_entrance mall_entrance { get; set; }
+    }
+
+    public class PDDFrontProductInfo2_mall_entrance
+    {
+        public PDDFrontProductInfo2_mall_data mall_data { get; set; }
+    }
+
+    public class PDDFrontProductInfo2_mall_data
+    {   
+        public string mall_id { get; set; } // "268866967",
+        public string mall_name { get; set; } // "汐汐家的小店78",
+    }
+
+    public class PDDFrontProductInfo2_price
+    {   
+        public int? line_price { get; set; } // 3524,
+        public int? price_style { get; set; } // 2,
+        public string price_suffix { get; set; } // "起",
+        public int? browser_price_style { get; set; } // 2,
+        public string browser_price_suffix { get; set; } // "起",
+        public int? min_on_sale_group_price { get; set; } // 622,
+        public int? max_on_sale_group_price { get; set; } // 1258,
+        public int? min_on_sale_normal_price { get; set; } // 2949,
+        public int? max_on_sale_normal_price { get; set; } // 3424,
+        public int? min_group_price { get; set; } // 622,
+        public int? max_group_price { get; set; } // 1258,
+        public int? max_normal_price { get; set; } // 3424,
+        public int? min_normal_price { get; set; } // 2949,
+        public int? old_min_on_sale_group_price { get; set; } // 2849,
+        public int? old_max_on_sale_group_price { get; set; } // 3324,
+        public int? old_min_group_price { get; set; } // 2849,
+        public int? old_max_group_price { get; set; } // 3324,
+        public int? unselect_normal_save_price { get; set; } // 2269,
+        public string new_price_prefix { get; set; } // "大促价"
+
+    }
+
+    public class PDDFrontProductInfo2_sku
+    {
+        public long? sku_id { get; set; } // 1728823886434,
+        public long? goods_id { get; set; } // 740124855378,
+        public string thumb_url { get; set; } // "https://img.pddpic.com/mms-material-img/2025-04-24/49694f57-4472-4f1b-b661-d7ac68909db6.jpeg.a.jpeg",
+        public long? init_quantity { get; set; } // 0,
+        public int? quantity { get; set; } // 907,
+        public long? limit_quantity { get; set; } // 999999,
+        public long? sold_quantity { get; set; } // 0,
+        public long? default_quantity { get; set; } // 100,
+        public long? is_onsale { get; set; } // 1,
+        public string spec { get; set; } // "27028052769,523089985",
+        public List<PDDFrontProductInfo2_spec> specs { get; set; }
+        public int? price { get; set; } // 0,
+        public int? normal_price { get; set; } // 3424,
+        public int? group_price { get; set; } // 1258,
+        public int? old_group_price { get; set; } // 3324,
+        public int? market_price { get; set; } // 0,
+        public int? weight { get; set; } // 0,
+        public object yellow_label_list { get; set; } // [ { "label_text": "2件9.9折", "label_type": "single_goods_percentage_event" } ],
+        public long? preview_priority { get; set; } // 0,
+        public long? start_time { get; set; } // 0,
+        public long? end_time { get; set; } // 0,
+        public long? static_limit_quantity { get; set; } // 22416,
+        public string attribute { get; set; } // "{\"skuPreSaleTime\":0}",
+        public int? normal_save_price { get; set; } // 2166,
+        public int? sku_price { get; set; } // 1258
+
+    }
+
+    public class PDDFrontProductInfo2_spec
+    {
+        public string spec_key { get; set; } // "型号",
+        public string spec_value { get; set; } // "【短/裤】灰色+黑色k",
+        public long? spec_key_id { get; set; } // 1473,
+        public long? spec_value_id { get; set; } // 27028052769,
+        public bool? custom { get; set; } // false
+    }
+
+    public class PDDFrontProductInfo2_goods
+    {
+        public long? goods_id { get; set; } // 740124855378,
+        public long? cat_id { get; set; } // 23980,
+        public long? mall_id { get; set; } // 268866967,
+        public int? market_price { get; set; } // 3524,
+        public int? quantity { get; set; } // 1000,
+        //public string allowed_region { get; set; } // "2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32",
+        //public string country { get; set; } // "",
+        //public string warehouse { get; set; } // "",
+        public int? goods_type { get; set; } // 1,
+        //public long? cost_template_id { get; set; } // 538091597071767,
+        //public object vas_template_id { get; set; } // {},
+        //public string cost_province_codes { get; set; } // "5,9,19,20,21,28,29",
+        //public int? has_cost { get; set; } // 0,
+        public int? customer_num { get; set; } // 2,
+        //public List<int> options { get; set; } // Array[5],
+        //public List<int> new_options { get; set; } // Array[11],
+        public string goods_name { get; set; } // "男士休闲冰丝7分裤夏季运动短裤宽松大码七分五分裤中裤大裤衩",
+        public string share_desc { get; set; } // "【未发货可秒退】男士休闲冰丝7分裤夏季运动短裤宽松大码七分五分裤中裤大裤衩",
+        //public string share_link { get; set; } // "goods.html?goods_id=740124855378&page_from=35&pxq_secret_key=BJDIHCBY7YC4VCYDYIG7X6WVXU5O5S6N2VWZXSPLFRDU6ZGVJQRQ&_oak_share_snapshot_num=622&_oak_share_detail_id=22748330909&_oak_share_time=1780124019&share_oak_rcto=YWIshVCDq5jUwxJgNtFfNVWm94kq07DT4sJANGguc8zUR-nw0cmmncHLpsKJyWxb_Xk&_oak_share_ticket=null",
+        //public string preview_share_link { get; set; } // "mall_quality_assurance.html?_t_timestamp=comm_share_landing&goods_id=740124855378",
+        public string side_sales_tip { get; set; } // "已拼1.3万+件",
+        public long? sold_quantity { get; set; } // 13000,
+        //public int? is_app { get; set; } // 0,
+        //public int? app_new { get; set; } // 0,
+        //public int? we_chat_only { get; set; } // 0,
+        //public int? app_client_only { get; set; } // 0,
+        public int? is_onsale { get; set; } // 1,
+        public int? is_sku_onsale { get; set; } // 1,
+        public string hd_url { get; set; } // "https://img.pddpic.com/mms-material-img/2025-04-24/dfb3f103-9346-4c6a-81aa-3873cd8a6b94.jpeg.a.jpeg",
+        public string thumb_url { get; set; } // "https://img.pddpic.com/gaudit-image/2025-04-28/5e57dbe65a6e329c8c41ebb692710dfb.jpeg",
+        public string hd_thumb_url { get; set; } // "https://img.pddpic.com/gaudit-image/2025-04-28/531f7d8ec6ab4eefe0f45dcd693995b1.jpeg",
+        public string image_url { get; set; } // "https://img.pddpic.com/gaudit-image/2025-04-28/5e57dbe65a6e329c8c41ebb692710dfb.jpeg",
+        //public List<string> images { get; set; } // [ ],
+        public int? second_hand { get; set; } // 0,
+        public int? is_pre_sale { get; set; } // 0,
+        public int? pre_sale_time { get; set; } // 0,
+        //public int? show_rec { get; set; } // 1,
+        //public int? show_rec_title { get; set; } // 1,
+        //public object call_waist_rec_extra_params { get; set; } // { "shield_mall_goods_rec": 1 },
+        //public int? is_mall_rec { get; set; } // 0,
+        //public int? rv_image { get; set; } // 1,
+        //public int? rv { get; set; } // 1,
+        //public int? gpv { get; set; } // 2,
+        //public int? is_mall_dsr { get; set; } // 1,
+        public int? skip_goods { get; set; } // "0",
+        public long? shipment_limit_second { get; set; } // 172800,
+        public List<PDDFrontProductInfo2_gallery> gallery { get; set; }
+        public List<PDDFrontProductInfo2_goods_property> goods_property { get; set; }
+        public int? property_show_num { get; set; } // 3,
+        public int? has_activity { get; set; } // 1,
+        public long? created_at { get; set; } // 1745853825,
+        public string short_name { get; set; } // "男士休闲冰丝7分裤夏季运动短裤宽松大码七分五分裤中裤大裤衩",
+        public long? cat_id_1 { get; set; } // 239,
+        public long? cat_id_2 { get; set; } // 23979,
+        public long? cat_id_3 { get; set; } // 23980,
+        public long? cat_id_4 { get; set; } // 0,
+
+    }
+
+    public class PDDFrontProductInfo2_goods_property
+    {
+        public string key { get; set; }
+        public List<string> values { get; set; }
+        public long? ref_pid { get; set; }
+        public long? reference_id { get; set; }
+    }
+
+    public class PDDFrontProductInfo2_gallery
+    { 
+        public long? id { get; set; } // 1324122714994,
+        public long? goods_id { get; set; } // 740124855378,
+        public string url { get; set; } // "https://img.pddpic.com/mms-material-img/2025-04-28/8e85227f-458d-452d-b4ba-e6f720b4b8e8.jpeg",
+        public int? width { get; set; } // 800,
+        public int? height { get; set; } // 800,
+        public int? priority { get; set; } // -1,
+        public int? type { get; set; } // 1,
+        public int? enable_share { get; set; } // 1
+
+    }
+}
diff --git a/TEMUKJD/BLL/PDDProdFormConverter.cs b/TEMUKJD/BLL/PDDProdFormConverter.cs
index 773f3ee..2e8efba 100644
--- a/TEMUKJD/BLL/PDDProdFormConverter.cs
+++ b/TEMUKJD/BLL/PDDProdFormConverter.cs
@@ -29,7 +29,6 @@ namespace TemuKJD.BLL
             try
             {
                 frontProdInfo = JsonHelper.DeserializeJsonToObject<PDDFrontProductInfo>(outProdJson);
-                
             }
             catch(Exception ex)
             {
@@ -387,7 +386,388 @@ namespace TemuKJD.BLL
             }
             return "";
         }
-         
+
+        /// <summary>
+        /// 拼多多前端采集转拼多多后台采集数据
+        /// </summary>
+        /// <param name="outProdJson"></param>
+        /// <param name="UpdateOldData"></param>
+        /// <param name="specialProdType"></param>
+        /// <returns></returns>
+        public string PddFrontToPddBackConvert2(string outProdJson, bool UpdateOldData = true, string specialProdType = null)
+        {
+            PDDFrontProductInfo2 frontProdInfo = null;
+            try
+            {
+                frontProdInfo = JsonHelper.DeserializeJsonToObject<PDDFrontProductInfo2>(outProdJson);
+            }
+            catch (Exception ex)
+            {
+                return "转换错误" + ex.Message;
+            }
+            if (frontProdInfo == null || frontProdInfo.goods.goods_id == null)
+            {
+                return "商品数据信息为空";
+            }
+
+            KJDDBProduct dbProd = new KJDDBProduct() { size_json = "{}" };
+            PDDProductInfo prodInfo = new PDDProductInfo()
+            {
+                source_json = JsonHelper.JObjectParse(outProdJson),
+                sale_count = frontProdInfo.goods.sold_quantity.ParseToLong().ParseToString(),
+                sale_count_text = frontProdInfo.goods.side_sales_tip,
+            };
+            prodInfo.chance_id = null;
+            prodInfo.chance_refere = null;
+            prodInfo.chance_tab = null;
+            prodInfo.decoration = new PDDProductDecorationInfo() { floor_list = new List<PDDProdfloorItem>() };
+
+            // 商品详情
+            prodInfo.detail = new PDDProductDetailInfo();
+            prodInfo.detail.allergy_refund = 0;
+            prodInfo.detail.allowed_region = new List<object>();
+            //prodInfo.detail.appeal_status = null;
+            //prodInfo.detail.app_id = null;
+            //prodInfo.detail.app_name = null;
+            //prodInfo.detail.bad_claim_text = null;
+            prodInfo.detail.bad_fruit_claim = 0;
+            //prodInfo.detail.business_source_type = null;
+            prodInfo.detail.can_appeal = null;
+            prodInfo.detail.card_verification_list = null;
+            prodInfo.detail.cats = new List<string>();
+            prodInfo.detail.cat_id = frontProdInfo.goods.cat_id.ParseToInt();
+            prodInfo.detail.cat_ids = new List<int?>() { frontProdInfo.goods.cat_id_1.ParseToInt(), frontProdInfo.goods.cat_id_2.ParseToInt(), frontProdInfo.goods.cat_id_3.ParseToInt(), frontProdInfo.goods.cat_id_4.ParseToInt() };
+            prodInfo.detail.check_status = 9;
+            //prodInfo.detail.check_type = null;
+            //prodInfo.detail.client_id = null;
+            prodInfo.detail.commit_deleted = 0;
+            //prodInfo.detail.commit_extension = null;
+            //prodInfo.detail.community_group_buying = null;
+            prodInfo.detail.cost_template_id = 0;
+            //prodInfo.detail.country = null;
+            prodInfo.detail.country_id = 0;
+            //prodInfo.detail.created_at = null;
+            //prodInfo.detail.creator_name = null;
+            prodInfo.detail.customizable = 0;
+            prodInfo.detail.customs = "";
+            prodInfo.detail.damage_claim = 0;
+            prodInfo.detail.delivery_one_day = 0;
+            //prodInfo.detail.delivery_type = null;
+            //prodInfo.detail.elec_goods_attributes = null;
+            prodInfo.detail.estimate_quantity = 0;
+            prodInfo.detail.event_type = 0;
+            prodInfo.detail.extend_warranty_dto = new extend_warranty_dto_item() { extend_warranty = 0 };
+            //prodInfo.detail.fabric = null;
+            //prodInfo.detail.fabric_content = null;
+            prodInfo.detail.galleries = new List<gallery_item>();
+            int galleryIndex = 0;
+            foreach (var frontGallery in frontProdInfo.goods.gallery)
+            {
+                if (frontGallery.type == 6)
+                {
+                    prodInfo.detail.galleries.Add(new gallery_item()
+                    {
+                        url = frontGallery.url,
+                        type = frontGallery.type,
+                        width = 0,
+                        height = 0,
+                    });
+                }
+                else
+                {
+                    //string getImgError;
+                    //var image = GetHtml.GetUrlImg(frontGallery.url.Replace("https://", "http://"), out getImgError);
+                    //if (!string.IsNullOrEmpty(getImgError))
+                    //{
+                    //    return getImgError;
+                    //}
+                    prodInfo.detail.galleries.Add(new gallery_item()
+                    {
+                        url = frontGallery.url,
+                        type = frontGallery.type,
+                        //width = image.Width,
+                        //height = image.Height,
+                    });
+                }
+                galleryIndex++;
+            }
+            prodInfo.detail.gold_price_template_id = null;
+            prodInfo.detail.gold_price_type = null;
+            prodInfo.detail.goods_certificate = null;
+            prodInfo.detail.goods_commit_check = new List<object>();
+            prodInfo.detail.goods_desc = frontProdInfo.goods.share_desc;
+            prodInfo.detail.goods_id = frontProdInfo.goods.goods_id;
+            prodInfo.detail.goods_name = frontProdInfo.goods.goods_name;
+            prodInfo.detail.goods_name_prefix = "";
+            prodInfo.detail.goods_pattern = 8;
+            prodInfo.detail.goods_property_list = null;
+            prodInfo.detail.goods_sn = null;
+            prodInfo.detail.goods_srv_templates = new List<object>();
+            prodInfo.detail.goods_trade_attr = null;
+            prodInfo.detail.goods_travel_attr = null;
+            prodInfo.detail.goods_type = 1;
+            prodInfo.detail.groups = new group_item() { single_price = 0, group_price = 0, customer_num = 2, buy_limit = 999999, order_limit = 999999 };
+            prodInfo.detail.hd_thumb_url = frontProdInfo.goods.hd_thumb_url;
+            prodInfo.detail.id = 0; // 编辑id，随意填写
+            prodInfo.detail.image_url = frontProdInfo.goods.image_url;
+            prodInfo.detail.instruction_vo = new instruction_vo_item() { template_status = -1 };
+            prodInfo.detail.invoice_mode = null;
+            prodInfo.detail.invoice_mode_sub_type = null;
+            prodInfo.detail.invoice_status = 0;
+            prodInfo.detail.is_all_weight_same = true;
+            prodInfo.detail.is_app = 0;
+            prodInfo.detail.is_bangdan = 0;
+            prodInfo.detail.is_card_secret = false;
+            prodInfo.detail.is_certificate_provide = 0;
+            prodInfo.detail.is_customized = 0;
+            prodInfo.detail.is_customs = 0;
+            prodInfo.detail.is_deposit = false;
+            prodInfo.detail.is_draft = false;
+            prodInfo.detail.is_folt = 0;
+            prodInfo.detail.is_general_trade = 0;
+            prodInfo.detail.is_gold_price_matched = null;
+            prodInfo.detail.is_goods_copy = null;
+            prodInfo.detail.is_goods_decoration = 1;
+            prodInfo.detail.is_group_pre_sale = 0;
+            prodInfo.detail.is_only_for_remote_area = false;
+            prodInfo.detail.is_pre_sale = 0;
+            prodInfo.detail.is_refundable = 1;
+            prodInfo.detail.is_refundable_fifteen_day = 0;
+            prodInfo.detail.is_shop = 1;
+            prodInfo.detail.is_size_change_casually = 0;
+            prodInfo.detail.is_sku_pre_sale = 0;
+            prodInfo.detail.is_sku_shipment = 0;
+            prodInfo.detail.is_small_group = null;
+            prodInfo.detail.is_spring_festival_open_tag = false;
+            prodInfo.detail.is_two_num_group = false;
+            prodInfo.detail.is_warranty_one_year = 0;
+            prodInfo.detail.is_wms = 0;
+            prodInfo.detail.is_wp_service = 0;
+            prodInfo.detail.lack_of_weight_claim = 0;
+            prodInfo.detail.last_commit_check_status = 2;
+            prodInfo.detail.list_desc = new List<object>();
+            prodInfo.detail.local_service_id_list = null;
+            prodInfo.detail.mai_jia_zi_ti = null;
+            prodInfo.detail.mall_id = frontProdInfo.goods.mall_id;
+            prodInfo.detail.mall_info = new mall_info_item() { mall_name = frontProdInfo.mall_entrance?.mall_data?.mall_name };
+            prodInfo.detail.market_price = frontProdInfo.price.line_price;
+            prodInfo.detail.max_group_price = frontProdInfo.price.max_group_price;
+            prodInfo.detail.min_group_price = frontProdInfo.price.min_group_price;
+            prodInfo.detail.must_check_type = 0;
+            prodInfo.detail.name_prefix = "";
+            prodInfo.detail.origin_country_id = 0;
+            prodInfo.detail.origin_country_name = "";
+            prodInfo.detail.out_goods_sn = "";
+            prodInfo.detail.out_source_goods_id = null;
+            prodInfo.detail.out_source_type = null;
+            prodInfo.detail.oversea_goods = null;
+            prodInfo.detail.oversea_type = 0;
+            prodInfo.detail.owner = "主账号";
+            prodInfo.detail.owner_name = "";
+            prodInfo.detail.paper_length = null;
+            prodInfo.detail.paper_net_weight = null;
+            prodInfo.detail.paper_plies_num = null;
+            prodInfo.detail.paper_width = null;
+            prodInfo.detail.pre_sale_time = 0;
+            prodInfo.detail.privacy_delivery = 0;
+            prodInfo.detail.processing_charges = null;
+            prodInfo.detail.processing_charges_type = null;
+            prodInfo.detail.promised_delivery_seconds = null;
+            prodInfo.detail.purchase_info_supply = 0;
+            prodInfo.detail.qualification_id_list = new List<object>();
+            prodInfo.detail.quan_guo_lian_bao = 0;
+            prodInfo.detail.quick_refund = 0;
+            prodInfo.detail.reason = null;
+            prodInfo.detail.region_limit = 1;
+            prodInfo.detail.reject_reason = null;
+            prodInfo.detail.reject_status = null;
+            prodInfo.detail.same_city_template_id = 0;
+            prodInfo.detail.schedule_sale = new schedule_sale_item() { sale_type = 0 };
+            prodInfo.detail.second_hand = 0;
+            prodInfo.detail.sf_markup_template_sn = null;
+            prodInfo.detail.shang_men_an_zhuang = null;
+            prodInfo.detail.share_desc = frontProdInfo.goods.share_desc;
+            prodInfo.detail.shipment_limit_second = 172800;
+            prodInfo.detail.shoes_template_id = null;
+            prodInfo.detail.shop_group_id = null;
+            prodInfo.detail.shop_group_name = null;
+            prodInfo.detail.show_activity_price = false;
+            prodInfo.detail.size_parent_spec_id = null;
+            prodInfo.detail.size_spec_id = null;
+            prodInfo.detail.sku = new List<sku_item>();
+            foreach (var frontSku in frontProdInfo.sku)
+            {
+                sku_item skuInfo = new sku_item()
+                {
+                    id = 0,
+                    sku_id = frontSku.sku_id,
+                    sku_sn = null,
+                    carnival_price = 0,
+                    init_quantity = 0,
+                    is_onsale = 1,
+                    limit_quantity = 999999,
+                    multi_price = (int)frontSku.group_price.ParseToDecimal(),
+                    multi_price_in_yuan = null,
+                    price = (int)frontSku.normal_price.ParseToDecimal(),
+                    price_in_yuan = null,
+                    quantity = 0,
+                    reserve_quantity = 0,
+                    weight = 0,
+                    thumb_url = frontSku.thumb_url,
+                    thumb_url_file_id = null,
+                    thumb_url_status = null,
+                    thumb_url_is_deleted = null,
+                    quantity_delta = frontSku.quantity,
+                    spec = new List<spec_item>(),
+                    out_sku_sn = "",
+                    batch_id = null,
+                    priority = 1,
+                    ware_id = 0,
+                    ware_biz_type = null,
+                    advice_price = null,
+                    length = null,
+                    oversea_sku = null,
+                    cspu_id = null,
+                    child_skus = null,
+                    ref_sku_commit_id = 0,
+                    start_time = null,
+                    end_time = null,
+                    sku_srv_templates = null,
+                    calendar_rule_id = null,
+                    hot_live_group = null,
+                    pre_sale_time = 0,
+                    out_source_sku_id = null,
+                    dd_grocery_sku_params = null,
+                    sku_extended_attribute_dtos = null,
+                    sku_basic_property_dtos = null,
+                    spec_note_map = null,
+                    delivery_schedule_dtos = null,
+                    shipment_limit_second_list = null,
+                    sku69_code = "",
+                };
+                //List<string> specIds = frontSku.spec.Split(',').ToList();
+                //List<string> specKeys = frontSku.spec_keys.Split(';').ToList();
+                //List<string> specValues = frontSku.spec_values.Split(';').ToList();
+                //for (int i = 0; i < specIds.Count; i++)
+                //{
+                //    skuInfo.spec.Add(new spec_item()
+                //    {
+                //        parent_name = specKeys[i],
+                //        spec_id = specIds[i].ParseToLong(),
+                //        spec_name = specValues[i],
+                //    });
+                //}
+                foreach (var frontSpec in frontSku.specs)
+                {
+                    skuInfo.spec.Add(new spec_item()
+                    {
+                        parent_id = frontSpec.spec_key_id,
+                        parent_name = frontSpec.spec_key,
+                        spec_id = frontSpec.spec_value_id,
+                        spec_name = frontSpec.spec_value,
+                    });
+                }
+                prodInfo.detail.sku.Add(skuInfo);
+            }
+            prodInfo.detail.sku_type = null;
+            prodInfo.detail.song_huo_an_zhuang = null;
+            prodInfo.detail.song_huo_ru_hu = null;
+            prodInfo.detail.source = 0;
+            prodInfo.detail.spu_id = null;
+            prodInfo.detail.spu_version = null;
+            prodInfo.detail.submit_time = 0;
+            prodInfo.detail.thawed_refund = 0;
+            prodInfo.detail.third_type = 0;
+            prodInfo.detail.thumb_url = frontProdInfo.goods.thumb_url;
+            prodInfo.detail.tiny_name = "";
+            prodInfo.detail.transport_type_list = null;
+            prodInfo.detail.two_pieces_discount = 99;
+            prodInfo.detail.user_source = 1;
+            prodInfo.detail.warehouse = "";
+            prodInfo.detail.warm_tips = "";
+            prodInfo.detail.zhi_huan_bu_xiu = 0;
+
+            prodInfo.size = null;
+            prodInfo.material1 = null;
+            prodInfo.material3 = null;
+            prodInfo.property = new PDDProductPropertyInfo();
+            prodInfo.property.sku_properties = new object();
+            prodInfo.property.goods_properties = new List<goods_propertie_item>();
+            foreach (var frontProp in frontProdInfo.goods.goods_property)
+            {
+                goods_propertie_item propInfo = new goods_propertie_item();
+                propInfo.name = frontProp.key;
+                propInfo.values = new List<value_item>();
+                foreach (var frontPropValue in frontProp.values)
+                {
+                    propInfo.values.Add(new value_item() { value = frontPropValue, raw_value = frontPropValue, unit = "" });
+                }
+                prodInfo.property.goods_properties.Add(propInfo);
+            }
+            dbProd.main_img = prodInfo.detail.galleries.FirstOrDefault(g => g.type == 1).url;
+            dbProd.product_json = JsonHelper.SerializeObject(prodInfo);
+
+            bool isExist = false;
+            var existUrl = BaseClass.BuildPDDObjString("product/get_product_list");
+            string existData = UserLogin.GetSignaturex() + "&search_spu=" + prodInfo.detail.goods_id;
+            string html = GetHtml.PostUtf8(existUrl, existData);
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                html = GetHtml.PostUtf8(existUrl, existData);
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                html = GetHtml.PostUtf8(existUrl, existData);
+            if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
+            {
+                if (html.Contains("\"data\":[") && !html.Contains("\"data\":[]"))
+                    isExist = true;
+            }
+            else
+            {
+                return "入库失败，产品数据库已存在商品查询失败";
+            }
+
+            var url = BaseClass.BuildPDDObjString("product/add_product");
+            if (isExist)
+            {
+                if (UpdateOldData)
+                {
+                    url = BaseClass.BuildPDDObjString("product/mdy_product");
+                }
+                else
+                {
+                    return "已存在相同id商品，跳过";
+                }
+            }
+
+            var data = Work.UserLogin.GetSignaturex() +
+                "&from_shop_id=" + frontProdInfo.goods?.mall_id +
+                "&spu_id=" + prodInfo.detail.goods_id.ParseToString() +
+                "&skc_id=" + prodInfo.detail.goods_id.ParseToString() +
+                "&price_text=" + prodInfo.detail.sku.Min(s => s.multi_price).ParseToInt() * 0.01m + "-" + prodInfo.detail.sku.Max(s => s.multi_price).ParseToInt() * 0.01m +
+                "&main_cat_id=" + (prodInfo.detail.cat_ids?.FirstOrDefault(c => c != null)).ParseToString() +
+                "&main_cat_name=" + HttpUtility.UrlEncode((prodInfo.detail.cat_ids?.FirstOrDefault(c => c != null)).ParseToString(), Encoding.UTF8) + // 取不到catname直接用catid，上货时候再取
+                "&cat_id=" + prodInfo.detail.cat_id.ParseToString() +
+                "&cat_name=" + HttpUtility.UrlEncode(prodInfo.detail.cat_id.ParseToString(), Encoding.UTF8) + // 取不到catname直接用catid，上货时候再取
+                "&ext_code=" + HttpUtility.UrlEncode(prodInfo.detail.out_goods_sn, Encoding.UTF8) +
+                "&product_name=" + HttpUtility.UrlEncode(prodInfo.detail.goods_name, Encoding.UTF8) +
+                "&product_json=" + HttpUtility.UrlEncode(dbProd.product_json, Encoding.UTF8) +
+                "&size_json=" + HttpUtility.UrlEncode(dbProd.size_json, Encoding.UTF8) +
+                "&main_img=" + HttpUtility.UrlEncode(dbProd.main_img, Encoding.UTF8) +
+                "&sale_count=" + HttpUtility.UrlEncode(prodInfo.sale_count, Encoding.UTF8) +
+                "&sale_count_text=" + HttpUtility.UrlEncode(prodInfo.sale_count_text, Encoding.UTF8) +
+                "&product_get_type=" + HttpUtility.UrlEncode("外部数据", Encoding.UTF8);
+            if (!string.IsNullOrEmpty(specialProdType))
+                data += "&special_prod_type=" + HttpUtility.UrlEncode(specialProdType, Encoding.UTF8);
+
+            html = GetHtml.PostUtf8(url, data);
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                html = GetHtml.PostUtf8(url, data);
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+            {
+                return "商品采集保存失败!请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg");
+            }
+            return "";
+        }
+
         /// <summary>
         /// 聚水潭转pdd格式
         /// </summary>
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
index 3c3c788..53e8060 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
@@ -262,9 +262,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnExportIdImg.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnExportIdImg.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnExportIdImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnExportIdImg.Location = new System.Drawing.Point(12, 11);
+            this.btnExportIdImg.Location = new System.Drawing.Point(6, 11);
             this.btnExportIdImg.Name = "btnExportIdImg";
-            this.btnExportIdImg.Size = new System.Drawing.Size(88, 25);
+            this.btnExportIdImg.Size = new System.Drawing.Size(82, 25);
             this.btnExportIdImg.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnExportIdImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnExportIdImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -287,7 +287,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSetGroup.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSetGroup.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSetGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSetGroup.Location = new System.Drawing.Point(213, 11);
+            this.btnSetGroup.Location = new System.Drawing.Point(197, 11);
             this.btnSetGroup.Name = "btnSetGroup";
             this.btnSetGroup.Size = new System.Drawing.Size(84, 25);
             this.btnSetGroup.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -312,9 +312,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnDelSelect.Location = new System.Drawing.Point(312, 11);
+            this.btnDelSelect.Location = new System.Drawing.Point(296, 11);
             this.btnDelSelect.Name = "btnDelSelect";
-            this.btnDelSelect.Size = new System.Drawing.Size(84, 25);
+            this.btnDelSelect.Size = new System.Drawing.Size(105, 25);
             this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnDelSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnDelSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -334,7 +334,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbGroup.FormattingEnabled = true;
-            this.cmbGroup.Location = new System.Drawing.Point(119, 11);
+            this.cmbGroup.Location = new System.Drawing.Point(103, 11);
             this.cmbGroup.Name = "cmbGroup";
             this.cmbGroup.Size = new System.Drawing.Size(92, 25);
             this.cmbGroup.TabIndex = 640;
@@ -346,9 +346,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnImport.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnImport.Location = new System.Drawing.Point(312, 39);
+            this.btnImport.Location = new System.Drawing.Point(296, 39);
             this.btnImport.Name = "btnImport";
-            this.btnImport.Size = new System.Drawing.Size(84, 25);
+            this.btnImport.Size = new System.Drawing.Size(105, 25);
             this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnImport.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnImport.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -361,7 +361,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnImport.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnImport.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnImport.TabIndex = 741;
-            this.btnImport.Text = "导入外部数据";
+            this.btnImport.Text = "导入外部多多数据";
             this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
             // 
             // cmbSetWxSafe
@@ -373,7 +373,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "安全商品",
             "违规商品",
             "未校验"});
-            this.cmbSetWxSafe.Location = new System.Drawing.Point(119, 39);
+            this.cmbSetWxSafe.Location = new System.Drawing.Point(103, 39);
             this.cmbSetWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSetWxSafe.Name = "cmbSetWxSafe";
             this.cmbSetWxSafe.Size = new System.Drawing.Size(92, 25);
@@ -386,7 +386,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSetWxSafe.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSetWxSafe.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSetWxSafe.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSetWxSafe.Location = new System.Drawing.Point(213, 39);
+            this.btnSetWxSafe.Location = new System.Drawing.Point(197, 39);
             this.btnSetWxSafe.Name = "btnSetWxSafe";
             this.btnSetWxSafe.Size = new System.Drawing.Size(84, 25);
             this.btnSetWxSafe.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -827,7 +827,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "是",
             "否"});
-            this.cmbPddRelation.Location = new System.Drawing.Point(693, 7);
+            this.cmbPddRelation.Location = new System.Drawing.Point(693, 5);
             this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbPddRelation.Name = "cmbPddRelation";
             this.cmbPddRelation.Size = new System.Drawing.Size(38, 25);
@@ -882,7 +882,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat2.FormattingEnabled = true;
-            this.cmbCat2.Location = new System.Drawing.Point(262, 77);
+            this.cmbCat2.Location = new System.Drawing.Point(262, 75);
             this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat2.Name = "cmbCat2";
             this.cmbCat2.Size = new System.Drawing.Size(38, 25);
@@ -968,7 +968,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "机会商品",
             "以图搜品",
             "外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(262, 42);
+            this.cmbSourceType.Location = new System.Drawing.Point(262, 40);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
             this.cmbSourceType.Size = new System.Drawing.Size(38, 25);
@@ -1014,7 +1014,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "是",
             "否"});
-            this.cmbWxCat.Location = new System.Drawing.Point(581, 7);
+            this.cmbWxCat.Location = new System.Drawing.Point(581, 5);
             this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxCat.Name = "cmbWxCat";
             this.cmbWxCat.Size = new System.Drawing.Size(38, 25);
@@ -1036,7 +1036,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.cmbSort.Items.AddRange(new object[] {
             "入库时间",
             "曝光量"});
-            this.cmbSort.Location = new System.Drawing.Point(357, 42);
+            this.cmbSort.Location = new System.Drawing.Point(357, 40);
             this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSort.Name = "cmbSort";
             this.cmbSort.Size = new System.Drawing.Size(38, 25);
@@ -1100,7 +1100,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(167, 42);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(167, 40);
             this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
             this.cmbGroupFilter.Size = new System.Drawing.Size(38, 25);
@@ -1115,7 +1115,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "是",
             "否",
             "导出未拉回"});
-            this.cmbExportToOutServer.Location = new System.Drawing.Point(581, 42);
+            this.cmbExportToOutServer.Location = new System.Drawing.Point(581, 40);
             this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbExportToOutServer.Name = "cmbExportToOutServer";
             this.cmbExportToOutServer.Size = new System.Drawing.Size(38, 25);
@@ -1151,7 +1151,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "安全商品",
             "违规商品",
             "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(469, 42);
+            this.cmbWxSafe.Location = new System.Drawing.Point(469, 40);
             this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxSafe.Name = "cmbWxSafe";
             this.cmbWxSafe.Size = new System.Drawing.Size(38, 25);
@@ -1193,7 +1193,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat1.FormattingEnabled = true;
-            this.cmbCat1.Location = new System.Drawing.Point(167, 77);
+            this.cmbCat1.Location = new System.Drawing.Point(167, 75);
             this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat1.Name = "cmbCat1";
             this.cmbCat1.Size = new System.Drawing.Size(38, 25);
@@ -1215,7 +1215,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbCat3.FormattingEnabled = true;
-            this.cmbCat3.Location = new System.Drawing.Point(357, 77);
+            this.cmbCat3.Location = new System.Drawing.Point(357, 75);
             this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat3.Name = "cmbCat3";
             this.cmbCat3.Size = new System.Drawing.Size(38, 25);
@@ -1311,7 +1311,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "",
             "普通商品",
             "爆款数据"});
-            this.cmbSpProdType.Location = new System.Drawing.Point(805, 7);
+            this.cmbSpProdType.Location = new System.Drawing.Point(805, 5);
             this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSpProdType.Name = "cmbSpProdType";
             this.cmbSpProdType.Size = new System.Drawing.Size(38, 25);
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
index 874dcf0..07997b8 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
@@ -1149,7 +1149,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
 
                             }
 
-                            rst = new PDDProdFormConverter().PddFrontToPddBackConvert(content);
+                            if (content.Contains("\"spec_keys\"") && content.Contains("\"spec_values\"") && content.Contains("\"is_sku_pre_sale\""))
+                                rst = new PDDProdFormConverter().PddFrontToPddBackConvert(content);
+                            else if (content.Contains("\"destination_url\"") && content.Contains("\"destination_type\"") && content.Contains("\"pre_render_url\""))
+                            {
+                                rst = new PDDProdFormConverter().PddFrontToPddBackConvert2(content);
+                            }
                         }
                         catch (Exception ex)
                         {
@@ -1660,6 +1665,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                     continue;
                 }
 
+                // 只支持聚水潭数据（下面转换了，不是聚水潭数据理论上不能成功，此处可以注释）
+                //if (dbProd.product_get_type_text != "厂商数据")
+                //{
+                //    continue;
+                //}
+                // 只支持聚水潭数据
                 var rst = new WxProdFormConverter().JstPddConvertToWxOutServer(dbProd);
                 if (!rst.Contains("\"success\":true"))
                 {
diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.Designer.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.Designer.cs
index b385306..72ca882 100644
--- a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.Designer.cs
+++ b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.Designer.cs
@@ -32,33 +32,34 @@ namespace TemuKJD.WXForms.OrderForms
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle31 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle32 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle33 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle34 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle35 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle36 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle37 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle38 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle39 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle40 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle49 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle50 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle51 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle52 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle53 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle54 = new System.Windows.Forms.DataGridViewCellStyle();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
             this.chkSkipHasNotesOrder = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -174,6 +175,10 @@ namespace TemuKJD.WXForms.OrderForms
             this.lblShopName = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
             this.dgvOrder = new TemuKJD.UserComponent.DataGridViewEx();
+            this.splitContainer4 = new System.Windows.Forms.SplitContainer();
+            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+            this.btnClear = new DevComponents.DotNetBar.PanelEx();
+            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
             this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -199,6 +204,7 @@ namespace TemuKJD.WXForms.OrderForms
             this.colPriceCnt = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colTotalPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colDiscount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colCommissionFee = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colCurrentPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colCurrentStock = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colSendGift = new System.Windows.Forms.DataGridViewLinkColumn();
@@ -218,10 +224,6 @@ namespace TemuKJD.WXForms.OrderForms
             this.colNotesColor = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colEditNotes = new System.Windows.Forms.DataGridViewLinkColumn();
             this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.splitContainer4 = new System.Windows.Forms.SplitContainer();
-            this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
-            this.btnClear = new DevComponents.DotNetBar.PanelEx();
-            this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -1268,19 +1270,19 @@ namespace TemuKJD.WXForms.OrderForms
             // 
             this.dgvShop.AllowUserToAddRows = false;
             this.dgvShop.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle28.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle28;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvShop.AutoRowNumber = true;
             this.dgvShop.BackgroundColor = System.Drawing.Color.White;
             this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle29.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle29.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle29.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle29.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle29.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle29;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colSelect,
@@ -1912,19 +1914,19 @@ namespace TemuKJD.WXForms.OrderForms
             // 
             this.dgvOrder.AllowUserToAddRows = false;
             this.dgvOrder.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle30.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle30;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvOrder.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dgvOrder.AutoRowNumber = true;
             this.dgvOrder.BackgroundColor = System.Drawing.Color.White;
             this.dgvOrder.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle31.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle31.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle31.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle31.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle31.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle31.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle31.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle31;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvOrder.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvOrder.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvOrder.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colCheck,
@@ -1952,6 +1954,7 @@ namespace TemuKJD.WXForms.OrderForms
             this.colPriceCnt,
             this.colTotalPrice,
             this.colDiscount,
+            this.colCommissionFee,
             this.colCurrentPrice,
             this.colCurrentStock,
             this.colSendGift,
@@ -1984,394 +1987,6 @@ namespace TemuKJD.WXForms.OrderForms
             this.dgvOrder.RowsAdded += new System.Windows.Forms.DataGridViewRowsAddedEventHandler(this.dgvOrder_RowsAdded);
             this.dgvOrder.RowsRemoved += new System.Windows.Forms.DataGridViewRowsRemovedEventHandler(this.dgvOrder_RowsRemoved);
             // 
-            // colCheck
-            // 
-            this.colCheck.Frozen = true;
-            this.colCheck.HeaderText = "选择";
-            this.colCheck.Name = "colCheck";
-            this.colCheck.ReadOnly = true;
-            this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colCheck.Width = 30;
-            // 
-            // colSupplierId
-            // 
-            this.colSupplierId.Frozen = true;
-            this.colSupplierId.HeaderText = "店铺Id";
-            this.colSupplierId.Name = "colSupplierId";
-            this.colSupplierId.ReadOnly = true;
-            this.colSupplierId.Visible = false;
-            // 
-            // colSupplierName
-            // 
-            dataGridViewCellStyle32.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle32;
-            this.colSupplierName.Frozen = true;
-            this.colSupplierName.HeaderText = "店铺名称";
-            this.colSupplierName.Name = "colSupplierName";
-            this.colSupplierName.ReadOnly = true;
-            this.colSupplierName.Width = 65;
-            // 
-            // colOrderShopNotes
-            // 
-            this.colOrderShopNotes.Frozen = true;
-            this.colOrderShopNotes.HeaderText = "店铺备注";
-            this.colOrderShopNotes.Name = "colOrderShopNotes";
-            this.colOrderShopNotes.ReadOnly = true;
-            this.colOrderShopNotes.Visible = false;
-            // 
-            // colOrderShopGroup
-            // 
-            this.colOrderShopGroup.Frozen = true;
-            this.colOrderShopGroup.HeaderText = "店铺分组";
-            this.colOrderShopGroup.Name = "colOrderShopGroup";
-            this.colOrderShopGroup.ReadOnly = true;
-            this.colOrderShopGroup.Visible = false;
-            // 
-            // colLogin
-            // 
-            this.colLogin.Frozen = true;
-            this.colLogin.HeaderText = "登录";
-            this.colLogin.Name = "colLogin";
-            this.colLogin.ReadOnly = true;
-            this.colLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colLogin.Visible = false;
-            this.colLogin.Width = 38;
-            // 
-            // colInShop
-            // 
-            this.colInShop.Frozen = true;
-            this.colInShop.HeaderText = "进店";
-            this.colInShop.Name = "colInShop";
-            this.colInShop.ReadOnly = true;
-            this.colInShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colInShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colInShop.Width = 38;
-            // 
-            // colOrderId
-            // 
-            this.colOrderId.Frozen = true;
-            this.colOrderId.HeaderText = "订单号";
-            this.colOrderId.Name = "colOrderId";
-            this.colOrderId.ReadOnly = true;
-            this.colOrderId.Width = 145;
-            // 
-            // colOrderTimeFull
-            // 
-            this.colOrderTimeFull.HeaderText = "完整时间";
-            this.colOrderTimeFull.Name = "colOrderTimeFull";
-            this.colOrderTimeFull.ReadOnly = true;
-            this.colOrderTimeFull.Visible = false;
-            // 
-            // colOrderTime
-            // 
-            dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colOrderTime.DefaultCellStyle = dataGridViewCellStyle33;
-            this.colOrderTime.HeaderText = "时间";
-            this.colOrderTime.Name = "colOrderTime";
-            this.colOrderTime.ReadOnly = true;
-            this.colOrderTime.Width = 50;
-            // 
-            // colImgUrl
-            // 
-            this.colImgUrl.HeaderText = "图片地址";
-            this.colImgUrl.Name = "colImgUrl";
-            this.colImgUrl.ReadOnly = true;
-            this.colImgUrl.Visible = false;
-            // 
-            // colProductSkcPic
-            // 
-            this.colProductSkcPic.HeaderText = "图片";
-            this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
-            this.colProductSkcPic.Name = "colProductSkcPic";
-            this.colProductSkcPic.ReadOnly = true;
-            this.colProductSkcPic.Width = 60;
-            // 
-            // colProdInfo
-            // 
-            dataGridViewCellStyle34.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProdInfo.DefaultCellStyle = dataGridViewCellStyle34;
-            this.colProdInfo.HeaderText = "商品信息";
-            this.colProdInfo.Name = "colProdInfo";
-            this.colProdInfo.ReadOnly = true;
-            this.colProdInfo.Width = 200;
-            // 
-            // colSpuId
-            // 
-            this.colSpuId.HeaderText = "商品Id";
-            this.colSpuId.Name = "colSpuId";
-            this.colSpuId.ReadOnly = true;
-            this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
-            this.colSpuId.Visible = false;
-            this.colSpuId.Width = 110;
-            // 
-            // colProductName
-            // 
-            dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProductName.DefaultCellStyle = dataGridViewCellStyle35;
-            this.colProductName.HeaderText = "商品名称";
-            this.colProductName.Name = "colProductName";
-            this.colProductName.ReadOnly = true;
-            this.colProductName.Visible = false;
-            this.colProductName.Width = 120;
-            // 
-            // colSpuCode
-            // 
-            this.colSpuCode.HeaderText = "商品货号";
-            this.colSpuCode.Name = "colSpuCode";
-            this.colSpuCode.ReadOnly = true;
-            this.colSpuCode.Visible = false;
-            this.colSpuCode.Width = 145;
-            // 
-            // colSkuId
-            // 
-            this.colSkuId.HeaderText = "SkuId";
-            this.colSkuId.Name = "colSkuId";
-            this.colSkuId.ReadOnly = true;
-            this.colSkuId.Visible = false;
-            // 
-            // colSkuSpec
-            // 
-            dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSkuSpec.DefaultCellStyle = dataGridViewCellStyle36;
-            this.colSkuSpec.HeaderText = "Sku规格";
-            this.colSkuSpec.Name = "colSkuSpec";
-            this.colSkuSpec.ReadOnly = true;
-            this.colSkuSpec.Visible = false;
-            // 
-            // colSkuCode
-            // 
-            dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSkuCode.DefaultCellStyle = dataGridViewCellStyle37;
-            this.colSkuCode.HeaderText = "Sku货号";
-            this.colSkuCode.Name = "colSkuCode";
-            this.colSkuCode.ReadOnly = true;
-            this.colSkuCode.Visible = false;
-            this.colSkuCode.Width = 220;
-            // 
-            // colCode
-            // 
-            dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colCode.DefaultCellStyle = dataGridViewCellStyle38;
-            this.colCode.HeaderText = "货号信息";
-            this.colCode.Name = "colCode";
-            this.colCode.ReadOnly = true;
-            this.colCode.Visible = false;
-            this.colCode.Width = 200;
-            // 
-            // colSalePrice
-            // 
-            this.colSalePrice.HeaderText = "单价";
-            this.colSalePrice.Name = "colSalePrice";
-            this.colSalePrice.ReadOnly = true;
-            this.colSalePrice.Visible = false;
-            // 
-            // colCnt
-            // 
-            this.colCnt.HeaderText = "件数";
-            this.colCnt.Name = "colCnt";
-            this.colCnt.ReadOnly = true;
-            this.colCnt.Visible = false;
-            // 
-            // colPriceCnt
-            // 
-            dataGridViewCellStyle39.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colPriceCnt.DefaultCellStyle = dataGridViewCellStyle39;
-            this.colPriceCnt.HeaderText = "价/量";
-            this.colPriceCnt.Name = "colPriceCnt";
-            this.colPriceCnt.ReadOnly = true;
-            this.colPriceCnt.Width = 50;
-            // 
-            // colTotalPrice
-            // 
-            dataGridViewCellStyle40.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colTotalPrice.DefaultCellStyle = dataGridViewCellStyle40;
-            this.colTotalPrice.HeaderText = "合计";
-            this.colTotalPrice.Name = "colTotalPrice";
-            this.colTotalPrice.ReadOnly = true;
-            this.colTotalPrice.Width = 50;
-            // 
-            // colDiscount
-            // 
-            dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.colDiscount.DefaultCellStyle = dataGridViewCellStyle41;
-            this.colDiscount.HeaderText = "优惠";
-            this.colDiscount.Name = "colDiscount";
-            this.colDiscount.ReadOnly = true;
-            this.colDiscount.Visible = false;
-            this.colDiscount.Width = 50;
-            // 
-            // colCurrentPrice
-            // 
-            dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colCurrentPrice.DefaultCellStyle = dataGridViewCellStyle42;
-            this.colCurrentPrice.HeaderText = "当前价";
-            this.colCurrentPrice.Name = "colCurrentPrice";
-            this.colCurrentPrice.ReadOnly = true;
-            this.colCurrentPrice.Width = 50;
-            // 
-            // colCurrentStock
-            // 
-            dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
-            this.colCurrentStock.DefaultCellStyle = dataGridViewCellStyle43;
-            this.colCurrentStock.HeaderText = "现库存";
-            this.colCurrentStock.Name = "colCurrentStock";
-            this.colCurrentStock.ReadOnly = true;
-            this.colCurrentStock.Width = 50;
-            // 
-            // colSendGift
-            // 
-            dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.colSendGift.DefaultCellStyle = dataGridViewCellStyle44;
-            this.colSendGift.HeaderText = "礼";
-            this.colSendGift.Name = "colSendGift";
-            this.colSendGift.ReadOnly = true;
-            this.colSendGift.Visible = false;
-            this.colSendGift.Width = 30;
-            // 
-            // colOptimizeOrderProduct
-            // 
-            this.colOptimizeOrderProduct.HeaderText = "优化";
-            this.colOptimizeOrderProduct.Name = "colOptimizeOrderProduct";
-            this.colOptimizeOrderProduct.ReadOnly = true;
-            this.colOptimizeOrderProduct.Width = 38;
-            // 
-            // colEndDiscount
-            // 
-            this.colEndDiscount.HeaderText = "取消优惠";
-            this.colEndDiscount.Name = "colEndDiscount";
-            this.colEndDiscount.ReadOnly = true;
-            this.colEndDiscount.Width = 63;
-            // 
-            // colOrderStatus
-            // 
-            dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colOrderStatus.DefaultCellStyle = dataGridViewCellStyle45;
-            this.colOrderStatus.HeaderText = "状态";
-            this.colOrderStatus.Name = "colOrderStatus";
-            this.colOrderStatus.ReadOnly = true;
-            this.colOrderStatus.Width = 45;
-            // 
-            // colUpdateStatus
-            // 
-            dataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colUpdateStatus.DefaultCellStyle = dataGridViewCellStyle46;
-            this.colUpdateStatus.HeaderText = "刷新";
-            this.colUpdateStatus.Name = "colUpdateStatus";
-            this.colUpdateStatus.ReadOnly = true;
-            this.colUpdateStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colUpdateStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colUpdateStatus.Width = 37;
-            // 
-            // colBuyUrl
-            // 
-            dataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colBuyUrl.DefaultCellStyle = dataGridViewCellStyle47;
-            this.colBuyUrl.HeaderText = "采购地址";
-            this.colBuyUrl.Name = "colBuyUrl";
-            this.colBuyUrl.ReadOnly = true;
-            // 
-            // colEditBuyPath
-            // 
-            this.colEditBuyPath.HeaderText = "编辑";
-            this.colEditBuyPath.Name = "colEditBuyPath";
-            this.colEditBuyPath.ReadOnly = true;
-            this.colEditBuyPath.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colEditBuyPath.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colEditBuyPath.Width = 38;
-            // 
-            // colReceiveInfo
-            // 
-            dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colReceiveInfo.DefaultCellStyle = dataGridViewCellStyle48;
-            this.colReceiveInfo.HeaderText = "收货信息";
-            this.colReceiveInfo.Name = "colReceiveInfo";
-            this.colReceiveInfo.ReadOnly = true;
-            this.colReceiveInfo.Width = 120;
-            // 
-            // colDecrypt
-            // 
-            dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.colDecrypt.DefaultCellStyle = dataGridViewCellStyle49;
-            this.colDecrypt.HeaderText = "👁";
-            this.colDecrypt.Name = "colDecrypt";
-            this.colDecrypt.ReadOnly = true;
-            this.colDecrypt.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colDecrypt.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colDecrypt.Width = 30;
-            // 
-            // colAddReceiveInfo
-            // 
-            dataGridViewCellStyle50.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.colAddReceiveInfo.DefaultCellStyle = dataGridViewCellStyle50;
-            this.colAddReceiveInfo.HeaderText = "填";
-            this.colAddReceiveInfo.Name = "colAddReceiveInfo";
-            this.colAddReceiveInfo.ReadOnly = true;
-            this.colAddReceiveInfo.Width = 30;
-            // 
-            // colPrintId
-            // 
-            this.colPrintId.HeaderText = "打印编号";
-            this.colPrintId.Name = "colPrintId";
-            this.colPrintId.ReadOnly = true;
-            // 
-            // colOnlineWaybillOrderId
-            // 
-            this.colOnlineWaybillOrderId.HeaderText = "任务编号";
-            this.colOnlineWaybillOrderId.Name = "colOnlineWaybillOrderId";
-            this.colOnlineWaybillOrderId.ReadOnly = true;
-            this.colOnlineWaybillOrderId.Width = 145;
-            // 
-            // colOnlineWaybill
-            // 
-            dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colOnlineWaybill.DefaultCellStyle = dataGridViewCellStyle51;
-            this.colOnlineWaybill.HeaderText = "打印";
-            this.colOnlineWaybill.Name = "colOnlineWaybill";
-            this.colOnlineWaybill.ReadOnly = true;
-            this.colOnlineWaybill.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            this.colOnlineWaybill.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
-            this.colOnlineWaybill.Width = 38;
-            // 
-            // colNotes
-            // 
-            dataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colNotes.DefaultCellStyle = dataGridViewCellStyle52;
-            this.colNotes.HeaderText = "备注";
-            this.colNotes.Name = "colNotes";
-            this.colNotes.ReadOnly = true;
-            this.colNotes.Width = 160;
-            // 
-            // colNotesColor
-            // 
-            this.colNotesColor.HeaderText = "备注颜色Id";
-            this.colNotesColor.Name = "colNotesColor";
-            this.colNotesColor.ReadOnly = true;
-            this.colNotesColor.Visible = false;
-            // 
-            // colEditNotes
-            // 
-            dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colEditNotes.DefaultCellStyle = dataGridViewCellStyle53;
-            this.colEditNotes.HeaderText = "修改";
-            this.colEditNotes.Name = "colEditNotes";
-            this.colEditNotes.ReadOnly = true;
-            this.colEditNotes.Width = 38;
-            // 
-            // colOpResult
-            // 
-            dataGridViewCellStyle54.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colOpResult.DefaultCellStyle = dataGridViewCellStyle54;
-            this.colOpResult.HeaderText = "操作结果";
-            this.colOpResult.Name = "colOpResult";
-            this.colOpResult.ReadOnly = true;
-            this.colOpResult.Width = 120;
-            // 
             // splitContainer4
             // 
             this.splitContainer4.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -2452,6 +2067,404 @@ namespace TemuKJD.WXForms.OrderForms
             this.panelEx1.Text = "停止当前操作";
             this.panelEx1.Visible = false;
             // 
+            // colCheck
+            // 
+            this.colCheck.Frozen = true;
+            this.colCheck.HeaderText = "选择";
+            this.colCheck.Name = "colCheck";
+            this.colCheck.ReadOnly = true;
+            this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colCheck.Width = 30;
+            // 
+            // colSupplierId
+            // 
+            this.colSupplierId.Frozen = true;
+            this.colSupplierId.HeaderText = "店铺Id";
+            this.colSupplierId.Name = "colSupplierId";
+            this.colSupplierId.ReadOnly = true;
+            this.colSupplierId.Visible = false;
+            // 
+            // colSupplierName
+            // 
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5;
+            this.colSupplierName.Frozen = true;
+            this.colSupplierName.HeaderText = "店铺名称";
+            this.colSupplierName.Name = "colSupplierName";
+            this.colSupplierName.ReadOnly = true;
+            this.colSupplierName.Width = 65;
+            // 
+            // colOrderShopNotes
+            // 
+            this.colOrderShopNotes.Frozen = true;
+            this.colOrderShopNotes.HeaderText = "店铺备注";
+            this.colOrderShopNotes.Name = "colOrderShopNotes";
+            this.colOrderShopNotes.ReadOnly = true;
+            this.colOrderShopNotes.Visible = false;
+            // 
+            // colOrderShopGroup
+            // 
+            this.colOrderShopGroup.Frozen = true;
+            this.colOrderShopGroup.HeaderText = "店铺分组";
+            this.colOrderShopGroup.Name = "colOrderShopGroup";
+            this.colOrderShopGroup.ReadOnly = true;
+            this.colOrderShopGroup.Visible = false;
+            // 
+            // colLogin
+            // 
+            this.colLogin.Frozen = true;
+            this.colLogin.HeaderText = "登录";
+            this.colLogin.Name = "colLogin";
+            this.colLogin.ReadOnly = true;
+            this.colLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colLogin.Visible = false;
+            this.colLogin.Width = 38;
+            // 
+            // colInShop
+            // 
+            this.colInShop.Frozen = true;
+            this.colInShop.HeaderText = "进店";
+            this.colInShop.Name = "colInShop";
+            this.colInShop.ReadOnly = true;
+            this.colInShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colInShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colInShop.Width = 38;
+            // 
+            // colOrderId
+            // 
+            this.colOrderId.Frozen = true;
+            this.colOrderId.HeaderText = "订单号";
+            this.colOrderId.Name = "colOrderId";
+            this.colOrderId.ReadOnly = true;
+            this.colOrderId.Width = 145;
+            // 
+            // colOrderTimeFull
+            // 
+            this.colOrderTimeFull.HeaderText = "完整时间";
+            this.colOrderTimeFull.Name = "colOrderTimeFull";
+            this.colOrderTimeFull.ReadOnly = true;
+            this.colOrderTimeFull.Visible = false;
+            // 
+            // colOrderTime
+            // 
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colOrderTime.DefaultCellStyle = dataGridViewCellStyle6;
+            this.colOrderTime.HeaderText = "时间";
+            this.colOrderTime.Name = "colOrderTime";
+            this.colOrderTime.ReadOnly = true;
+            this.colOrderTime.Width = 50;
+            // 
+            // colImgUrl
+            // 
+            this.colImgUrl.HeaderText = "图片地址";
+            this.colImgUrl.Name = "colImgUrl";
+            this.colImgUrl.ReadOnly = true;
+            this.colImgUrl.Visible = false;
+            // 
+            // colProductSkcPic
+            // 
+            this.colProductSkcPic.HeaderText = "图片";
+            this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
+            this.colProductSkcPic.Name = "colProductSkcPic";
+            this.colProductSkcPic.ReadOnly = true;
+            this.colProductSkcPic.Width = 60;
+            // 
+            // colProdInfo
+            // 
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProdInfo.DefaultCellStyle = dataGridViewCellStyle7;
+            this.colProdInfo.HeaderText = "商品信息";
+            this.colProdInfo.Name = "colProdInfo";
+            this.colProdInfo.ReadOnly = true;
+            this.colProdInfo.Width = 200;
+            // 
+            // colSpuId
+            // 
+            this.colSpuId.HeaderText = "商品Id";
+            this.colSpuId.Name = "colSpuId";
+            this.colSpuId.ReadOnly = true;
+            this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.colSpuId.Visible = false;
+            this.colSpuId.Width = 110;
+            // 
+            // colProductName
+            // 
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductName.DefaultCellStyle = dataGridViewCellStyle8;
+            this.colProductName.HeaderText = "商品名称";
+            this.colProductName.Name = "colProductName";
+            this.colProductName.ReadOnly = true;
+            this.colProductName.Visible = false;
+            this.colProductName.Width = 120;
+            // 
+            // colSpuCode
+            // 
+            this.colSpuCode.HeaderText = "商品货号";
+            this.colSpuCode.Name = "colSpuCode";
+            this.colSpuCode.ReadOnly = true;
+            this.colSpuCode.Visible = false;
+            this.colSpuCode.Width = 145;
+            // 
+            // colSkuId
+            // 
+            this.colSkuId.HeaderText = "SkuId";
+            this.colSkuId.Name = "colSkuId";
+            this.colSkuId.ReadOnly = true;
+            this.colSkuId.Visible = false;
+            // 
+            // colSkuSpec
+            // 
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSkuSpec.DefaultCellStyle = dataGridViewCellStyle9;
+            this.colSkuSpec.HeaderText = "Sku规格";
+            this.colSkuSpec.Name = "colSkuSpec";
+            this.colSkuSpec.ReadOnly = true;
+            this.colSkuSpec.Visible = false;
+            // 
+            // colSkuCode
+            // 
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSkuCode.DefaultCellStyle = dataGridViewCellStyle10;
+            this.colSkuCode.HeaderText = "Sku货号";
+            this.colSkuCode.Name = "colSkuCode";
+            this.colSkuCode.ReadOnly = true;
+            this.colSkuCode.Visible = false;
+            this.colSkuCode.Width = 220;
+            // 
+            // colCode
+            // 
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCode.DefaultCellStyle = dataGridViewCellStyle11;
+            this.colCode.HeaderText = "货号信息";
+            this.colCode.Name = "colCode";
+            this.colCode.ReadOnly = true;
+            this.colCode.Visible = false;
+            this.colCode.Width = 200;
+            // 
+            // colSalePrice
+            // 
+            this.colSalePrice.HeaderText = "单价";
+            this.colSalePrice.Name = "colSalePrice";
+            this.colSalePrice.ReadOnly = true;
+            this.colSalePrice.Visible = false;
+            // 
+            // colCnt
+            // 
+            this.colCnt.HeaderText = "件数";
+            this.colCnt.Name = "colCnt";
+            this.colCnt.ReadOnly = true;
+            this.colCnt.Visible = false;
+            // 
+            // colPriceCnt
+            // 
+            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colPriceCnt.DefaultCellStyle = dataGridViewCellStyle12;
+            this.colPriceCnt.HeaderText = "价/量";
+            this.colPriceCnt.Name = "colPriceCnt";
+            this.colPriceCnt.ReadOnly = true;
+            this.colPriceCnt.Width = 50;
+            // 
+            // colTotalPrice
+            // 
+            dataGridViewCellStyle13.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colTotalPrice.DefaultCellStyle = dataGridViewCellStyle13;
+            this.colTotalPrice.HeaderText = "合计";
+            this.colTotalPrice.Name = "colTotalPrice";
+            this.colTotalPrice.ReadOnly = true;
+            this.colTotalPrice.Width = 50;
+            // 
+            // colDiscount
+            // 
+            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.colDiscount.DefaultCellStyle = dataGridViewCellStyle14;
+            this.colDiscount.HeaderText = "优惠";
+            this.colDiscount.Name = "colDiscount";
+            this.colDiscount.ReadOnly = true;
+            this.colDiscount.Visible = false;
+            this.colDiscount.Width = 50;
+            // 
+            // colCommissionFee
+            // 
+            dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCommissionFee.DefaultCellStyle = dataGridViewCellStyle15;
+            this.colCommissionFee.HeaderText = "佣金";
+            this.colCommissionFee.Name = "colCommissionFee";
+            this.colCommissionFee.ReadOnly = true;
+            this.colCommissionFee.Width = 38;
+            // 
+            // colCurrentPrice
+            // 
+            dataGridViewCellStyle16.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCurrentPrice.DefaultCellStyle = dataGridViewCellStyle16;
+            this.colCurrentPrice.HeaderText = "当前价";
+            this.colCurrentPrice.Name = "colCurrentPrice";
+            this.colCurrentPrice.ReadOnly = true;
+            this.colCurrentPrice.Width = 50;
+            // 
+            // colCurrentStock
+            // 
+            dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight;
+            this.colCurrentStock.DefaultCellStyle = dataGridViewCellStyle17;
+            this.colCurrentStock.HeaderText = "现库存";
+            this.colCurrentStock.Name = "colCurrentStock";
+            this.colCurrentStock.ReadOnly = true;
+            this.colCurrentStock.Width = 50;
+            // 
+            // colSendGift
+            // 
+            dataGridViewCellStyle18.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colSendGift.DefaultCellStyle = dataGridViewCellStyle18;
+            this.colSendGift.HeaderText = "礼";
+            this.colSendGift.Name = "colSendGift";
+            this.colSendGift.ReadOnly = true;
+            this.colSendGift.Visible = false;
+            this.colSendGift.Width = 30;
+            // 
+            // colOptimizeOrderProduct
+            // 
+            this.colOptimizeOrderProduct.HeaderText = "优化";
+            this.colOptimizeOrderProduct.Name = "colOptimizeOrderProduct";
+            this.colOptimizeOrderProduct.ReadOnly = true;
+            this.colOptimizeOrderProduct.Width = 38;
+            // 
+            // colEndDiscount
+            // 
+            this.colEndDiscount.HeaderText = "取消优惠";
+            this.colEndDiscount.Name = "colEndDiscount";
+            this.colEndDiscount.ReadOnly = true;
+            this.colEndDiscount.Width = 63;
+            // 
+            // colOrderStatus
+            // 
+            dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colOrderStatus.DefaultCellStyle = dataGridViewCellStyle19;
+            this.colOrderStatus.HeaderText = "状态";
+            this.colOrderStatus.Name = "colOrderStatus";
+            this.colOrderStatus.ReadOnly = true;
+            this.colOrderStatus.Width = 45;
+            // 
+            // colUpdateStatus
+            // 
+            dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colUpdateStatus.DefaultCellStyle = dataGridViewCellStyle20;
+            this.colUpdateStatus.HeaderText = "刷新";
+            this.colUpdateStatus.Name = "colUpdateStatus";
+            this.colUpdateStatus.ReadOnly = true;
+            this.colUpdateStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colUpdateStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colUpdateStatus.Width = 37;
+            // 
+            // colBuyUrl
+            // 
+            dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colBuyUrl.DefaultCellStyle = dataGridViewCellStyle21;
+            this.colBuyUrl.HeaderText = "采购地址";
+            this.colBuyUrl.Name = "colBuyUrl";
+            this.colBuyUrl.ReadOnly = true;
+            // 
+            // colEditBuyPath
+            // 
+            this.colEditBuyPath.HeaderText = "编辑";
+            this.colEditBuyPath.Name = "colEditBuyPath";
+            this.colEditBuyPath.ReadOnly = true;
+            this.colEditBuyPath.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colEditBuyPath.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colEditBuyPath.Width = 38;
+            // 
+            // colReceiveInfo
+            // 
+            dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colReceiveInfo.DefaultCellStyle = dataGridViewCellStyle22;
+            this.colReceiveInfo.HeaderText = "收货信息";
+            this.colReceiveInfo.Name = "colReceiveInfo";
+            this.colReceiveInfo.ReadOnly = true;
+            this.colReceiveInfo.Width = 120;
+            // 
+            // colDecrypt
+            // 
+            dataGridViewCellStyle23.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colDecrypt.DefaultCellStyle = dataGridViewCellStyle23;
+            this.colDecrypt.HeaderText = "👁";
+            this.colDecrypt.Name = "colDecrypt";
+            this.colDecrypt.ReadOnly = true;
+            this.colDecrypt.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colDecrypt.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colDecrypt.Width = 30;
+            // 
+            // colAddReceiveInfo
+            // 
+            dataGridViewCellStyle24.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.colAddReceiveInfo.DefaultCellStyle = dataGridViewCellStyle24;
+            this.colAddReceiveInfo.HeaderText = "填";
+            this.colAddReceiveInfo.Name = "colAddReceiveInfo";
+            this.colAddReceiveInfo.ReadOnly = true;
+            this.colAddReceiveInfo.Width = 30;
+            // 
+            // colPrintId
+            // 
+            this.colPrintId.HeaderText = "打印编号";
+            this.colPrintId.Name = "colPrintId";
+            this.colPrintId.ReadOnly = true;
+            // 
+            // colOnlineWaybillOrderId
+            // 
+            this.colOnlineWaybillOrderId.HeaderText = "任务编号";
+            this.colOnlineWaybillOrderId.Name = "colOnlineWaybillOrderId";
+            this.colOnlineWaybillOrderId.ReadOnly = true;
+            this.colOnlineWaybillOrderId.Width = 145;
+            // 
+            // colOnlineWaybill
+            // 
+            dataGridViewCellStyle25.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colOnlineWaybill.DefaultCellStyle = dataGridViewCellStyle25;
+            this.colOnlineWaybill.HeaderText = "打印";
+            this.colOnlineWaybill.Name = "colOnlineWaybill";
+            this.colOnlineWaybill.ReadOnly = true;
+            this.colOnlineWaybill.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colOnlineWaybill.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colOnlineWaybill.Width = 38;
+            // 
+            // colNotes
+            // 
+            dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colNotes.DefaultCellStyle = dataGridViewCellStyle26;
+            this.colNotes.HeaderText = "备注";
+            this.colNotes.Name = "colNotes";
+            this.colNotes.ReadOnly = true;
+            this.colNotes.Width = 160;
+            // 
+            // colNotesColor
+            // 
+            this.colNotesColor.HeaderText = "备注颜色Id";
+            this.colNotesColor.Name = "colNotesColor";
+            this.colNotesColor.ReadOnly = true;
+            this.colNotesColor.Visible = false;
+            // 
+            // colEditNotes
+            // 
+            dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colEditNotes.DefaultCellStyle = dataGridViewCellStyle27;
+            this.colEditNotes.HeaderText = "修改";
+            this.colEditNotes.Name = "colEditNotes";
+            this.colEditNotes.ReadOnly = true;
+            this.colEditNotes.Width = 38;
+            // 
+            // colOpResult
+            // 
+            dataGridViewCellStyle28.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colOpResult.DefaultCellStyle = dataGridViewCellStyle28;
+            this.colOpResult.HeaderText = "操作结果";
+            this.colOpResult.Name = "colOpResult";
+            this.colOpResult.ReadOnly = true;
+            this.colOpResult.Width = 120;
+            // 
             // WXOrderListForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -2614,6 +2627,13 @@ namespace TemuKJD.WXForms.OrderForms
         private DevComponents.DotNetBar.PanelEx btnStopBatchOnlieWaybill;
         private System.Windows.Forms.TextBox txtFilterPriceNotContainWords;
         private System.Windows.Forms.Label label21;
+        private DevComponents.DotNetBar.PanelEx btnBatchNotes;
+        private System.Windows.Forms.Label lblOrderCount;
+        private UserComponent.UcCheckBox chkSkipHasNotesOrder;
+        private System.Windows.Forms.Label label22;
+        private System.Windows.Forms.DateTimePicker dtpEndTime;
+        private System.Windows.Forms.DateTimePicker dtpStartTime;
+        private UserComponent.UcCheckBox chkTimeDuration;
         private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
         private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
         private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName;
@@ -2639,6 +2659,7 @@ namespace TemuKJD.WXForms.OrderForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colPriceCnt;
         private System.Windows.Forms.DataGridViewTextBoxColumn colTotalPrice;
         private System.Windows.Forms.DataGridViewTextBoxColumn colDiscount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colCommissionFee;
         private System.Windows.Forms.DataGridViewTextBoxColumn colCurrentPrice;
         private System.Windows.Forms.DataGridViewTextBoxColumn colCurrentStock;
         private System.Windows.Forms.DataGridViewLinkColumn colSendGift;
@@ -2658,12 +2679,5 @@ namespace TemuKJD.WXForms.OrderForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colNotesColor;
         private System.Windows.Forms.DataGridViewLinkColumn colEditNotes;
         private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
-        private DevComponents.DotNetBar.PanelEx btnBatchNotes;
-        private System.Windows.Forms.Label lblOrderCount;
-        private UserComponent.UcCheckBox chkSkipHasNotesOrder;
-        private System.Windows.Forms.Label label22;
-        private System.Windows.Forms.DateTimePicker dtpEndTime;
-        private System.Windows.Forms.DateTimePicker dtpStartTime;
-        private UserComponent.UcCheckBox chkTimeDuration;
     }
 }
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs
index c5b93f8..a6c1d1d 100644
--- a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs
+++ b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.cs
@@ -1487,9 +1487,10 @@ namespace TemuKJD.WXForms.OrderForms
                                             orderProd.salePrice.ParseToInt() * 0.01m + "\r\nx" + orderProd.productCnt, // 商品单价/数量
                                             orderProd.realPrice * 0.01m + (discount > 0 ? "\r\n优惠\r\n-" + discount * 0.01m : ""), // 商品总价/优惠
                                             discount > 0 ? discount * 0.01m : null, // 商品优惠
+                                            orderProd.productSource?.commissionFee * 0.01m, // 达人佣金
 
-                                            currentPrice,
-                                            currentStock,
+                                            currentPrice, // 当前价
+                                            currentStock, // 库存
                                             "礼",
                                             "优化",
                                             "取消优惠",
diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.resx b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.resx
index 47c7016..0bcac70 100644
--- a/TEMUKJD/WXForms/OrderForms/WXOrderListForm.resx
+++ b/TEMUKJD/WXForms/OrderForms/WXOrderListForm.resx
@@ -231,6 +231,9 @@
   <metadata name="colDiscount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colCommissionFee.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colCurrentPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs
index a96eee5..2bab6cf 100644
--- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs
@@ -110,10 +110,8 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnLoginAssistant = new DevComponents.DotNetBar.PanelEx();
             this.商品裂变 = new System.Windows.Forms.TabPage();
             this.txtDetailBorderImgCount = new System.Windows.Forms.TextBox();
-            this.label35 = new System.Windows.Forms.Label();
             this.label36 = new System.Windows.Forms.Label();
             this.txtMainBorderImgCount = new System.Windows.Forms.TextBox();
-            this.label34 = new System.Windows.Forms.Label();
             this.label33 = new System.Windows.Forms.Label();
             this.label32 = new System.Windows.Forms.Label();
             this.txtAiImgCount = new System.Windows.Forms.TextBox();
@@ -226,6 +224,14 @@ namespace TemuKJD.WXForms.ProductForms
             this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
             this.btnClear = new DevComponents.DotNetBar.PanelEx();
             this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+            this.label35 = new System.Windows.Forms.Label();
+            this.label34 = new System.Windows.Forms.Label();
+            this.line1 = new DevComponents.DotNetBar.Controls.Line();
+            this.chkFissionRandomPriceChange = new TemuKJD.UserComponent.UcCheckBox(this.components);
+            this.txtFissionRandomPriceChange = new System.Windows.Forms.TextBox();
+            this.label37 = new System.Windows.Forms.Label();
+            this.label38 = new System.Windows.Forms.Label();
+            this.line2 = new DevComponents.DotNetBar.Controls.Line();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -276,7 +282,7 @@ namespace TemuKJD.WXForms.ProductForms
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
-            this.splitContainer1.Size = new System.Drawing.Size(1644, 641);
+            this.splitContainer1.Size = new System.Drawing.Size(1684, 641);
             this.splitContainer1.SplitterDistance = 165;
             this.splitContainer1.TabIndex = 11;
             // 
@@ -312,7 +318,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx2.Controls.Add(this.ucTabControlMetro1);
             this.ucGroupBoxEx2.Location = new System.Drawing.Point(595, 2);
             this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
-            this.ucGroupBoxEx2.Size = new System.Drawing.Size(1047, 165);
+            this.ucGroupBoxEx2.Size = new System.Drawing.Size(1087, 165);
             this.ucGroupBoxEx2.TabIndex = 667;
             this.ucGroupBoxEx2.TabStop = false;
             this.ucGroupBoxEx2.Text = "商品上传";
@@ -344,10 +350,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnStop.Location = new System.Drawing.Point(963, 47);
+            this.btnStop.Location = new System.Drawing.Point(1015, 44);
             this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnStop.Name = "btnStop";
-            this.btnStop.Size = new System.Drawing.Size(71, 23);
+            this.btnStop.Size = new System.Drawing.Size(64, 23);
             this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
             this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -368,7 +374,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(939, 15);
+            this.label7.Location = new System.Drawing.Point(993, 15);
             this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(20, 17);
@@ -380,7 +386,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.chkRandomCompanyProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.chkRandomCompanyProd.Checked = true;
             this.chkRandomCompanyProd.CheckState = System.Windows.Forms.CheckState.Checked;
-            this.chkRandomCompanyProd.Location = new System.Drawing.Point(765, 13);
+            this.chkRandomCompanyProd.Location = new System.Drawing.Point(819, 13);
             this.chkRandomCompanyProd.Name = "chkRandomCompanyProd";
             this.chkRandomCompanyProd.Size = new System.Drawing.Size(87, 21);
             this.chkRandomCompanyProd.TabIndex = 889;
@@ -406,10 +412,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnClearDgv.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnClearDgv.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnClearDgv.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnClearDgv.Location = new System.Drawing.Point(963, 75);
+            this.btnClearDgv.Location = new System.Drawing.Point(1015, 72);
             this.btnClearDgv.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnClearDgv.Name = "btnClearDgv";
-            this.btnClearDgv.Size = new System.Drawing.Size(71, 23);
+            this.btnClearDgv.Size = new System.Drawing.Size(64, 23);
             this.btnClearDgv.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnClearDgv.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
             this.btnClearDgv.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -563,7 +569,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(859, 15);
+            this.label6.Location = new System.Drawing.Point(913, 15);
             this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(56, 17);
@@ -586,7 +592,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtWaitSeconds
             // 
             this.txtWaitSeconds.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtWaitSeconds.Location = new System.Drawing.Point(915, 12);
+            this.txtWaitSeconds.Location = new System.Drawing.Point(969, 12);
             this.txtWaitSeconds.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtWaitSeconds.Name = "txtWaitSeconds";
             this.txtWaitSeconds.Size = new System.Drawing.Size(24, 23);
@@ -634,9 +640,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnUpload.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnUpload.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnUpload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnUpload.Location = new System.Drawing.Point(963, 19);
+            this.btnUpload.Location = new System.Drawing.Point(1015, 16);
             this.btnUpload.Name = "btnUpload";
-            this.btnUpload.Size = new System.Drawing.Size(71, 23);
+            this.btnUpload.Size = new System.Drawing.Size(64, 23);
             this.btnUpload.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnUpload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnUpload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -711,7 +717,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucTabControlMetro1.Name = "ucTabControlMetro1";
             this.ucTabControlMetro1.SelectedIndex = 0;
             this.ucTabControlMetro1.ShowCloseButton = false;
-            this.ucTabControlMetro1.Size = new System.Drawing.Size(539, 150);
+            this.ucTabControlMetro1.Size = new System.Drawing.Size(591, 150);
             this.ucTabControlMetro1.TabIndex = 822;
             this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray;
@@ -1211,6 +1217,10 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // 商品裂变
             // 
+            this.商品裂变.Controls.Add(this.line2);
+            this.商品裂变.Controls.Add(this.label38);
+            this.商品裂变.Controls.Add(this.txtFissionRandomPriceChange);
+            this.商品裂变.Controls.Add(this.chkFissionRandomPriceChange);
             this.商品裂变.Controls.Add(this.txtDetailBorderImgCount);
             this.商品裂变.Controls.Add(this.label35);
             this.商品裂变.Controls.Add(this.label36);
@@ -1226,10 +1236,12 @@ namespace TemuKJD.WXForms.ProductForms
             this.商品裂变.Controls.Add(this.chkFissionGoodsName);
             this.商品裂变.Controls.Add(this.chkRandomImgBorder);
             this.商品裂变.Controls.Add(this.txtFissionTitle);
+            this.商品裂变.Controls.Add(this.line1);
+            this.商品裂变.Controls.Add(this.label37);
             this.商品裂变.Location = new System.Drawing.Point(4, 28);
             this.商品裂变.Name = "商品裂变";
             this.商品裂变.Padding = new System.Windows.Forms.Padding(3);
-            this.商品裂变.Size = new System.Drawing.Size(531, 118);
+            this.商品裂变.Size = new System.Drawing.Size(583, 118);
             this.商品裂变.TabIndex = 3;
             this.商品裂变.Text = "商品裂变";
             this.商品裂变.UseVisualStyleBackColor = true;
@@ -1237,29 +1249,18 @@ namespace TemuKJD.WXForms.ProductForms
             // txtDetailBorderImgCount
             // 
             this.txtDetailBorderImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.txtDetailBorderImgCount.Location = new System.Drawing.Point(228, 90);
+            this.txtDetailBorderImgCount.Location = new System.Drawing.Point(212, 90);
             this.txtDetailBorderImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtDetailBorderImgCount.Name = "txtDetailBorderImgCount";
             this.txtDetailBorderImgCount.Size = new System.Drawing.Size(24, 23);
             this.txtDetailBorderImgCount.TabIndex = 902;
             this.txtDetailBorderImgCount.Text = "0";
             // 
-            // label35
-            // 
-            this.label35.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label35.AutoSize = true;
-            this.label35.Location = new System.Drawing.Point(186, 93);
-            this.label35.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
-            this.label35.Name = "label35";
-            this.label35.Size = new System.Drawing.Size(44, 17);
-            this.label35.TabIndex = 904;
-            this.label35.Text = "详情图";
-            // 
             // label36
             // 
             this.label36.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label36.AutoSize = true;
-            this.label36.Location = new System.Drawing.Point(252, 93);
+            this.label36.Location = new System.Drawing.Point(235, 93);
             this.label36.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label36.Name = "label36";
             this.label36.Size = new System.Drawing.Size(20, 17);
@@ -1269,29 +1270,18 @@ namespace TemuKJD.WXForms.ProductForms
             // txtMainBorderImgCount
             // 
             this.txtMainBorderImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.txtMainBorderImgCount.Location = new System.Drawing.Point(137, 90);
+            this.txtMainBorderImgCount.Location = new System.Drawing.Point(130, 90);
             this.txtMainBorderImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtMainBorderImgCount.Name = "txtMainBorderImgCount";
             this.txtMainBorderImgCount.Size = new System.Drawing.Size(24, 23);
             this.txtMainBorderImgCount.TabIndex = 899;
             this.txtMainBorderImgCount.Text = "9";
             // 
-            // label34
-            // 
-            this.label34.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.label34.AutoSize = true;
-            this.label34.Location = new System.Drawing.Point(106, 93);
-            this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
-            this.label34.Name = "label34";
-            this.label34.Size = new System.Drawing.Size(32, 17);
-            this.label34.TabIndex = 901;
-            this.label34.Text = "主图";
-            // 
             // label33
             // 
             this.label33.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label33.AutoSize = true;
-            this.label33.Location = new System.Drawing.Point(162, 93);
+            this.label33.Location = new System.Drawing.Point(153, 93);
             this.label33.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label33.Name = "label33";
             this.label33.Size = new System.Drawing.Size(20, 17);
@@ -1302,7 +1292,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label32.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.label32.AutoSize = true;
-            this.label32.Location = new System.Drawing.Point(497, 57);
+            this.label32.Location = new System.Drawing.Point(549, 57);
             this.label32.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label32.Name = "label32";
             this.label32.Size = new System.Drawing.Size(20, 17);
@@ -1313,7 +1303,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtAiImgCount
             // 
             this.txtAiImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtAiImgCount.Location = new System.Drawing.Point(472, 54);
+            this.txtAiImgCount.Location = new System.Drawing.Point(524, 54);
             this.txtAiImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtAiImgCount.Name = "txtAiImgCount";
             this.txtAiImgCount.Size = new System.Drawing.Size(24, 23);
@@ -1325,7 +1315,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.chkAiImage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.chkAiImage.AutoSize = true;
-            this.chkAiImage.Location = new System.Drawing.Point(403, 55);
+            this.chkAiImage.Location = new System.Drawing.Point(455, 55);
             this.chkAiImage.Name = "chkAiImage";
             this.chkAiImage.Size = new System.Drawing.Size(74, 21);
             this.chkAiImage.TabIndex = 892;
@@ -1336,21 +1326,21 @@ namespace TemuKJD.WXForms.ProductForms
             // chkRandomDetailImgOrder
             // 
             this.chkRandomDetailImgOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.chkRandomDetailImgOrder.Location = new System.Drawing.Point(385, 91);
+            this.chkRandomDetailImgOrder.Location = new System.Drawing.Point(383, 91);
             this.chkRandomDetailImgOrder.Name = "chkRandomDetailImgOrder";
-            this.chkRandomDetailImgOrder.Size = new System.Drawing.Size(107, 21);
+            this.chkRandomDetailImgOrder.Size = new System.Drawing.Size(54, 21);
             this.chkRandomDetailImgOrder.TabIndex = 896;
-            this.chkRandomDetailImgOrder.Text = "随机详情图顺序";
+            this.chkRandomDetailImgOrder.Text = "详情图";
             this.chkRandomDetailImgOrder.UseVisualStyleBackColor = true;
             // 
             // chkRandomMainImgOrder
             // 
             this.chkRandomMainImgOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.chkRandomMainImgOrder.Location = new System.Drawing.Point(283, 91);
+            this.chkRandomMainImgOrder.Location = new System.Drawing.Point(339, 91);
             this.chkRandomMainImgOrder.Name = "chkRandomMainImgOrder";
-            this.chkRandomMainImgOrder.Size = new System.Drawing.Size(94, 21);
+            this.chkRandomMainImgOrder.Size = new System.Drawing.Size(42, 21);
             this.chkRandomMainImgOrder.TabIndex = 895;
-            this.chkRandomMainImgOrder.Text = "随机主图顺序";
+            this.chkRandomMainImgOrder.Text = "主图";
             this.chkRandomMainImgOrder.UseVisualStyleBackColor = true;
             // 
             // lblFissionTitleCount
@@ -1391,7 +1381,8 @@ namespace TemuKJD.WXForms.ProductForms
             this.txtFissionTitle.Location = new System.Drawing.Point(81, 7);
             this.txtFissionTitle.Multiline = true;
             this.txtFissionTitle.Name = "txtFissionTitle";
-            this.txtFissionTitle.Size = new System.Drawing.Size(444, 79);
+            this.txtFissionTitle.ScrollBars = System.Windows.Forms.ScrollBars.Both;
+            this.txtFissionTitle.Size = new System.Drawing.Size(496, 79);
             this.txtFissionTitle.TabIndex = 0;
             this.txtFissionTitle.TextChanged += new System.EventHandler(this.txtFissionTitle_TextChanged);
             // 
@@ -2184,7 +2175,7 @@ namespace TemuKJD.WXForms.ProductForms
             // splitContainer3.Panel2
             // 
             this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
-            this.splitContainer3.Size = new System.Drawing.Size(1644, 472);
+            this.splitContainer3.Size = new System.Drawing.Size(1684, 472);
             this.splitContainer3.SplitterDistance = 442;
             this.splitContainer3.TabIndex = 1;
             // 
@@ -2214,7 +2205,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload);
             this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct);
             this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
-            this.splitContainer2.Size = new System.Drawing.Size(1644, 442);
+            this.splitContainer2.Size = new System.Drawing.Size(1684, 442);
             this.splitContainer2.SplitterDistance = 410;
             this.splitContainer2.TabIndex = 0;
             // 
@@ -2441,7 +2432,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(590, 196);
+            this.pbLoading.Location = new System.Drawing.Point(610, 196);
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.Size = new System.Drawing.Size(50, 50);
             this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -2456,7 +2447,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.并发上传.Cursor = System.Windows.Forms.Cursors.Hand;
             this.并发上传.DisabledBackColor = System.Drawing.Color.Empty;
             this.并发上传.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.并发上传.Location = new System.Drawing.Point(1104, 30);
+            this.并发上传.Location = new System.Drawing.Point(1144, 30);
             this.并发上传.Name = "并发上传";
             this.并发上传.Size = new System.Drawing.Size(118, 23);
             this.并发上传.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -2568,7 +2559,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.dgvSelectProduct.Name = "dgvSelectProduct";
             this.dgvSelectProduct.ReadOnly = true;
             this.dgvSelectProduct.RowTemplate.Height = 23;
-            this.dgvSelectProduct.Size = new System.Drawing.Size(1226, 442);
+            this.dgvSelectProduct.Size = new System.Drawing.Size(1266, 442);
             this.dgvSelectProduct.TabIndex = 187;
             this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
             // 
@@ -2774,8 +2765,8 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.splitContainer4.Panel2.Controls.Add(this.btnClear);
             this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
-            this.splitContainer4.Size = new System.Drawing.Size(1644, 26);
-            this.splitContainer4.SplitterDistance = 953;
+            this.splitContainer4.Size = new System.Drawing.Size(1684, 26);
+            this.splitContainer4.SplitterDistance = 993;
             this.splitContainer4.TabIndex = 3;
             // 
             // statusBar
@@ -2786,7 +2777,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.statusBar.Location = new System.Drawing.Point(0, 0);
             this.statusBar.Margin = new System.Windows.Forms.Padding(0);
             this.statusBar.Name = "statusBar";
-            this.statusBar.Size = new System.Drawing.Size(953, 26);
+            this.statusBar.Size = new System.Drawing.Size(993, 26);
             this.statusBar.TabIndex = 2;
             // 
             // btnClear
@@ -2839,11 +2830,95 @@ namespace TemuKJD.WXForms.ProductForms
             this.panelEx1.Text = "停止当前操作";
             this.panelEx1.Visible = false;
             // 
+            // label35
+            // 
+            this.label35.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label35.AutoSize = true;
+            this.label35.Location = new System.Drawing.Point(171, 93);
+            this.label35.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label35.Name = "label35";
+            this.label35.Size = new System.Drawing.Size(44, 17);
+            this.label35.TabIndex = 904;
+            this.label35.Text = "详情图";
+            // 
+            // label34
+            // 
+            this.label34.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label34.AutoSize = true;
+            this.label34.Location = new System.Drawing.Point(101, 93);
+            this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label34.Name = "label34";
+            this.label34.Size = new System.Drawing.Size(32, 17);
+            this.label34.TabIndex = 901;
+            this.label34.Text = "主图";
+            // 
+            // line1
+            // 
+            this.line1.ForeColor = System.Drawing.SystemColors.ControlDark;
+            this.line1.Location = new System.Drawing.Point(250, 90);
+            this.line1.Name = "line1";
+            this.line1.Size = new System.Drawing.Size(10, 23);
+            this.line1.TabIndex = 822;
+            this.line1.Text = "line1";
+            this.line1.VerticalLine = true;
+            // 
+            // chkFissionPriceChange
+            // 
+            this.chkFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.chkFissionRandomPriceChange.Location = new System.Drawing.Point(446, 91);
+            this.chkFissionRandomPriceChange.Name = "chkFissionPriceChange";
+            this.chkFissionRandomPriceChange.Size = new System.Drawing.Size(75, 21);
+            this.chkFissionRandomPriceChange.TabIndex = 905;
+            this.chkFissionRandomPriceChange.Text = "价格波动";
+            this.chkFissionRandomPriceChange.UseVisualStyleBackColor = true;
+            // 
+            // txtFissionPriceChange
+            // 
+            this.txtFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.txtFissionRandomPriceChange.Location = new System.Drawing.Point(513, 90);
+            this.txtFissionRandomPriceChange.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+            this.txtFissionRandomPriceChange.Name = "txtFissionPriceChange";
+            this.txtFissionRandomPriceChange.Size = new System.Drawing.Size(24, 23);
+            this.txtFissionRandomPriceChange.TabIndex = 906;
+            this.txtFissionRandomPriceChange.Text = "2";
+            // 
+            // label37
+            // 
+            this.label37.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label37.AutoSize = true;
+            this.label37.Location = new System.Drawing.Point(536, 93);
+            this.label37.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label37.Name = "label37";
+            this.label37.Size = new System.Drawing.Size(20, 17);
+            this.label37.TabIndex = 907;
+            this.label37.Text = "元";
+            // 
+            // label38
+            // 
+            this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.label38.AutoSize = true;
+            this.label38.Location = new System.Drawing.Point(259, 93);
+            this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label38.Name = "label38";
+            this.label38.Size = new System.Drawing.Size(80, 17);
+            this.label38.TabIndex = 908;
+            this.label38.Text = "随机图片顺序";
+            // 
+            // line2
+            // 
+            this.line2.ForeColor = System.Drawing.SystemColors.ControlDark;
+            this.line2.Location = new System.Drawing.Point(435, 90);
+            this.line2.Name = "line2";
+            this.line2.Size = new System.Drawing.Size(10, 23);
+            this.line2.TabIndex = 909;
+            this.line2.Text = "line2";
+            this.line2.VerticalLine = true;
+            // 
             // WXDBProdUploadForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(1644, 641);
+            this.ClientSize = new System.Drawing.Size(1684, 641);
             this.Controls.Add(this.splitContainer1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.KeyPreview = true;
@@ -3079,10 +3154,16 @@ namespace TemuKJD.WXForms.ProductForms
         private System.Windows.Forms.Label label32;
         private System.Windows.Forms.TextBox txtAiImgCount;
         private System.Windows.Forms.TextBox txtDetailBorderImgCount;
-        private System.Windows.Forms.Label label35;
         private System.Windows.Forms.Label label36;
         private System.Windows.Forms.TextBox txtMainBorderImgCount;
-        private System.Windows.Forms.Label label34;
         private System.Windows.Forms.Label label33;
+        private DevComponents.DotNetBar.Controls.Line line2;
+        private System.Windows.Forms.Label label38;
+        private System.Windows.Forms.TextBox txtFissionRandomPriceChange;
+        private UserComponent.UcCheckBox chkFissionRandomPriceChange;
+        private System.Windows.Forms.Label label35;
+        private System.Windows.Forms.Label label34;
+        private DevComponents.DotNetBar.Controls.Line line1;
+        private System.Windows.Forms.Label label37;
     }
 }
\ No newline at end of file
diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
index 0935bb2..bd9d4fe 100644
--- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs
@@ -1557,12 +1557,21 @@ namespace TemuKJD.WXForms.ProductForms
             }
 
             #region 将聚水潭产品数据格式进行转换成pdd格式统一上传，匹配加密的spuCode和skuCoke 微信小店的货号spuCode和外部商品编号outProductId/out_product_id对应加密的聚水潭goodsId
-            if (dbProd.product_get_type_text == "厂商直采" && dbProd.sku_secret_json != null && dbProd.sku_secret_json.Contains("goodsId"))
+            if (dbProd.product_get_type_text == "厂商直采")
             {
+                if (dbProd.sku_secret_json.IsNullOrEmpty() || !dbProd.sku_secret_json.Contains("goodsId"))
+                {
+                    return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品查询格式错误\"}";
+                }
+                if (dbProd.wx_cat_leaf.IsNullOrZero() || dbProd.send_to_out_server != 1 || dbProd.distribution_set != 1)
+                {
+                    return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品查询校验错误\"}";
+                }
+
                 string convertRst = "";
                 var pInfo = new PDDProdFormConverter().JstPddProdToPddConvert(out convertRst, dbProd);
                 if (!string.IsNullOrEmpty(convertRst))
-                    return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品查询错误 " + convertRst + "\"}";
+                    return "{\"success\":false,\"draftId\":0,\"status\":\"未上传\",\"errMsg\":\"商品查询错误 " + convertRst + "\"}"; 
             }
             #endregion
 
@@ -2591,8 +2600,9 @@ namespace TemuKJD.WXForms.ProductForms
                 }
             }
 
-            // 官方库1688厂家数据必须有退货地址才能上传，用户自采数据使用店铺或默认退货地址
-            else if (dbProd.product_get_type_text == "1688厂家" && dbProd.add_user_name == "admin")
+            // 官方库1688厂家数据必须有退货地址才能上传，用户自采数据使用店铺或默认退货地址 26.5.29
+            // 官方库暂时也放开限制可以随意传 26.5.31
+            else if (dbProd.product_get_type_text == "1688厂家" && dbProd.add_user_name == "admin" && 1 == 2)
             {
                 var urlAfterSale = BaseClass.BuildObjString("product/wx_get_after_sale");
                 var dataAfterSale = Work.UserLogin.GetSignaturex();
@@ -3241,8 +3251,15 @@ namespace TemuKJD.WXForms.ProductForms
                             attrValue = "1 kg";
                         //else if (attr.value == "g;kg;ml;L")
                         //    attrValue = "100 g";
-                        //else if (attr.value == "cm")
-                        //    attrValue = "20 cm";
+                        else if (attr.value == "cm")
+                        {
+                            var propValue = propInfo.values.FirstOrDefault()?.value;
+                            var match = BaseRegex.GetMatchRegexString(ref propValue, @"([\d]{1,4})cm");
+                            if (!string.IsNullOrEmpty(match))
+                            {
+                                attrValue = match + " cm";
+                            }
+                        }
                         else if (attr.value.Contains("岁以上") && attr.value.Contains("个月以上"))
                         {
                             attrValue = "7 岁以上";
@@ -3783,6 +3800,15 @@ namespace TemuKJD.WXForms.ProductForms
                 }
                 // 聚水潭上微信小店，加运费（其他平台shipPrice默认为0）
                 skuParam.productSkuInfo.salePrice += (shipPrice * defaultAddPriceRule.ShippingPriceTimes).ParseToInt();
+                // 商品裂变随机增加价格
+                if (BaseClass.UserAuthority.Contains("商品裂变") && chkFissionRandomPriceChange.Checked)
+                {
+                    Invoke(new Action(() =>
+                    {
+                        var fissionRandomPrice = Randomx.GetId((txtFissionRandomPriceChange.Text.ParseToDecimal() * 100).ParseToInt() + 1);
+                        skuParam.productSkuInfo.salePrice += fissionRandomPrice;
+                    }));
+                }
                 // sku图
                 skuParam.productSkuInfo.thumbImg = upProdParam.product.info.productSaleAttrs[0].items.FirstOrDefault(a => a.value == skuInfo.spec[0].spec_name)?.imgUrl;
                 if (dbProd.special_prod_type == "爆款数据")
@@ -5072,6 +5098,8 @@ namespace TemuKJD.WXForms.ProductForms
                 // 爆款数据商品
                 if (!string.IsNullOrWhiteSpace(cmbHot.Text.Trim()))
                     data += "&special_prod_type=" + cmbHot.Text.Replace("普通商品", "普通商品,书籍");
+                else if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.Contains("爆款数据"))
+                    data += "&special_prod_type=爆款数据,普通商品,书籍";
                 else
                     data += "&special_prod_type=普通商品,书籍";
 
@@ -5512,7 +5540,7 @@ namespace TemuKJD.WXForms.ProductForms
 
         private void cmbGroupFilter_SelectedIndexChanged(object sender, EventArgs e)
         {
-            if (cmbGroupFilter.Text == "我的商品" && cmbSourceType.Text != "" && cmbSourceType.Text != "多多商品" && cmbSourceType.Text != "1688商品")
+            if (cmbGroupFilter.Text == "我的商品" && cmbSourceType.Text != "多多商品" && cmbSourceType.Text != "1688商品")
             {
                 cmbSourceType.Text = "";
             }
@@ -5525,7 +5553,7 @@ namespace TemuKJD.WXForms.ProductForms
             else
                 fillWxCate();
 
-            if (!string.IsNullOrWhiteSpace(cmbSourceType.Text) && cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家")
+            if (cmbSourceType.Text != "厂商直采"/* && cmbSourceType.Text != "1688厂家"*/)
             {
                 cmbJstInitSet.Text = "";
             }
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs
index 003d727..61b6234 100644
--- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs
@@ -377,17 +377,17 @@ namespace TemuKJD.WXForms.ProductForms
             // txtCatBoundLessThan
             // 
             this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCatBoundLessThan.Location = new System.Drawing.Point(763, 41);
+            this.txtCatBoundLessThan.Location = new System.Drawing.Point(759, 41);
             this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtCatBoundLessThan.Name = "txtCatBoundLessThan";
-            this.txtCatBoundLessThan.Size = new System.Drawing.Size(109, 23);
+            this.txtCatBoundLessThan.Size = new System.Drawing.Size(108, 23);
             this.txtCatBoundLessThan.TabIndex = 883;
             this.txtCatBoundLessThan.Text = "100000";
             // 
             // chkCatBoundLessThan
             // 
             this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkCatBoundLessThan.Location = new System.Drawing.Point(696, 42);
+            this.chkCatBoundLessThan.Location = new System.Drawing.Point(692, 42);
             this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3);
             this.chkCatBoundLessThan.Name = "chkCatBoundLessThan";
             this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21);
@@ -402,7 +402,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.txtSPU.Location = new System.Drawing.Point(52, 6);
             this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSPU.Name = "txtSPU";
-            this.txtSPU.Size = new System.Drawing.Size(109, 23);
+            this.txtSPU.Size = new System.Drawing.Size(108, 23);
             this.txtSPU.TabIndex = 434;
             // 
             // label5
@@ -424,27 +424,27 @@ namespace TemuKJD.WXForms.ProductForms
             "",
             "是",
             "否"});
-            this.cmbWxCat.Location = new System.Drawing.Point(938, 5);
+            this.cmbWxCat.Location = new System.Drawing.Point(933, 7);
             this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxCat.Name = "cmbWxCat";
-            this.cmbWxCat.Size = new System.Drawing.Size(109, 25);
+            this.cmbWxCat.Size = new System.Drawing.Size(108, 25);
             this.cmbWxCat.TabIndex = 802;
             // 
             // txtProdName
             // 
             this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.tableLayoutPanel1.SetColumnSpan(this.txtProdName, 3);
-            this.txtProdName.Location = new System.Drawing.Point(227, 6);
+            this.txtProdName.Location = new System.Drawing.Point(226, 6);
             this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(267, 23);
+            this.txtProdName.Size = new System.Drawing.Size(265, 23);
             this.txtProdName.TabIndex = 427;
             // 
             // label12
             // 
             this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(878, 9);
+            this.label12.Location = new System.Drawing.Point(873, 9);
             this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(60, 17);
@@ -455,7 +455,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(167, 9);
+            this.label3.Location = new System.Drawing.Point(166, 9);
             this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(60, 17);
@@ -481,10 +481,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat1.DropDownWidth = 1;
             this.cmbCat1.FormattingEnabled = true;
             this.cmbCat1.IntegralHeight = false;
-            this.cmbCat1.Location = new System.Drawing.Point(52, 40);
+            this.cmbCat1.Location = new System.Drawing.Point(52, 42);
             this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat1.Name = "cmbCat1";
-            this.cmbCat1.Size = new System.Drawing.Size(109, 25);
+            this.cmbCat1.Size = new System.Drawing.Size(108, 25);
             this.cmbCat1.TabIndex = 805;
             this.cmbCat1.Text = "全部";
             this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged);
@@ -493,17 +493,17 @@ namespace TemuKJD.WXForms.ProductForms
             // txtCatBoundMoreThan
             // 
             this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCatBoundMoreThan.Location = new System.Drawing.Point(574, 41);
+            this.txtCatBoundMoreThan.Location = new System.Drawing.Point(571, 41);
             this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan";
-            this.txtCatBoundMoreThan.Size = new System.Drawing.Size(109, 23);
+            this.txtCatBoundMoreThan.Size = new System.Drawing.Size(108, 23);
             this.txtCatBoundMoreThan.TabIndex = 882;
             this.txtCatBoundMoreThan.Text = "1000";
             // 
             // chkCatBoundMoreThan
             // 
             this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkCatBoundMoreThan.Location = new System.Drawing.Point(507, 42);
+            this.chkCatBoundMoreThan.Location = new System.Drawing.Point(504, 42);
             this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(10, 3, 3, 3);
             this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan";
             this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21);
@@ -516,7 +516,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(184, 44);
+            this.label14.Location = new System.Drawing.Point(183, 44);
             this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(43, 17);
@@ -531,10 +531,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat2.DropDownWidth = 1;
             this.cmbCat2.FormattingEnabled = true;
             this.cmbCat2.IntegralHeight = false;
-            this.cmbCat2.Location = new System.Drawing.Point(227, 40);
+            this.cmbCat2.Location = new System.Drawing.Point(226, 42);
             this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat2.Name = "cmbCat2";
-            this.cmbCat2.Size = new System.Drawing.Size(109, 25);
+            this.cmbCat2.Size = new System.Drawing.Size(108, 25);
             this.cmbCat2.TabIndex = 804;
             this.cmbCat2.Text = "全部";
             this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged);
@@ -544,7 +544,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(342, 44);
+            this.label17.Location = new System.Drawing.Point(340, 44);
             this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(43, 17);
@@ -559,10 +559,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat3.DropDownWidth = 1;
             this.cmbCat3.FormattingEnabled = true;
             this.cmbCat3.IntegralHeight = false;
-            this.cmbCat3.Location = new System.Drawing.Point(385, 40);
+            this.cmbCat3.Location = new System.Drawing.Point(383, 42);
             this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat3.Name = "cmbCat3";
-            this.cmbCat3.Size = new System.Drawing.Size(109, 25);
+            this.cmbCat3.Size = new System.Drawing.Size(108, 25);
             this.cmbCat3.TabIndex = 811;
             this.cmbCat3.Text = "全部";
             this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged);
@@ -572,7 +572,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.lblWxSafe.AutoSize = true;
-            this.lblWxSafe.Location = new System.Drawing.Point(878, 44);
+            this.lblWxSafe.Location = new System.Drawing.Point(873, 44);
             this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblWxSafe.Name = "lblWxSafe";
             this.lblWxSafe.Size = new System.Drawing.Size(60, 17);
@@ -588,27 +588,27 @@ namespace TemuKJD.WXForms.ProductForms
             "安全+未校验",
             "安全商品",
             "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(938, 40);
+            this.cmbWxSafe.Location = new System.Drawing.Point(933, 42);
             this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxSafe.Name = "cmbWxSafe";
-            this.cmbWxSafe.Size = new System.Drawing.Size(109, 25);
+            this.cmbWxSafe.Size = new System.Drawing.Size(108, 25);
             this.cmbWxSafe.TabIndex = 676;
             this.cmbWxSafe.Text = "安全+未校验";
             // 
             // txtNotes
             // 
             this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtNotes.Location = new System.Drawing.Point(763, 6);
+            this.txtNotes.Location = new System.Drawing.Point(759, 6);
             this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtNotes.Name = "txtNotes";
-            this.txtNotes.Size = new System.Drawing.Size(109, 23);
+            this.txtNotes.Size = new System.Drawing.Size(108, 23);
             this.txtNotes.TabIndex = 439;
             // 
             // lblNotes
             // 
             this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblNotes.AutoSize = true;
-            this.lblNotes.Location = new System.Drawing.Point(727, 9);
+            this.lblNotes.Location = new System.Drawing.Point(723, 9);
             this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblNotes.Name = "lblNotes";
             this.lblNotes.Size = new System.Drawing.Size(36, 17);
@@ -623,10 +623,10 @@ namespace TemuKJD.WXForms.ProductForms
             "",
             "多多商品",
             "1688商品"});
-            this.cmbSourceType.Location = new System.Drawing.Point(574, 5);
+            this.cmbSourceType.Location = new System.Drawing.Point(571, 7);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
-            this.cmbSourceType.Size = new System.Drawing.Size(109, 25);
+            this.cmbSourceType.Size = new System.Drawing.Size(108, 25);
             this.cmbSourceType.TabIndex = 654;
             this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
             this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged);
@@ -635,7 +635,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblSourceType.AutoSize = true;
-            this.lblSourceType.Location = new System.Drawing.Point(530, 9);
+            this.lblSourceType.Location = new System.Drawing.Point(527, 9);
             this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblSourceType.Name = "lblSourceType";
             this.lblSourceType.Size = new System.Drawing.Size(44, 17);
diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs
index a0219aa..aa31452 100644
--- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs
+++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs
@@ -330,16 +330,16 @@ namespace TemuKJD.WXForms.ProductForms
             // txtViewUvMin
             // 
             this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtViewUvMin.Location = new System.Drawing.Point(1132, 41);
+            this.txtViewUvMin.Location = new System.Drawing.Point(1128, 41);
             this.txtViewUvMin.Name = "txtViewUvMin";
-            this.txtViewUvMin.Size = new System.Drawing.Size(58, 23);
+            this.txtViewUvMin.Size = new System.Drawing.Size(62, 23);
             this.txtViewUvMin.TabIndex = 882;
             this.txtViewUvMin.Visible = false;
             // 
             // chkViewUvMin
             // 
             this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkViewUvMin.Location = new System.Drawing.Point(1078, 42);
+            this.chkViewUvMin.Location = new System.Drawing.Point(1074, 42);
             this.chkViewUvMin.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.chkViewUvMin.Name = "chkViewUvMin";
             this.chkViewUvMin.Size = new System.Drawing.Size(48, 21);
@@ -356,10 +356,10 @@ namespace TemuKJD.WXForms.ProductForms
             "",
             "爆款数据",
             "普通商品"});
-            this.cmbHot.Location = new System.Drawing.Point(921, 7);
+            this.cmbHot.Location = new System.Drawing.Point(918, 7);
             this.cmbHot.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbHot.Name = "cmbHot";
-            this.cmbHot.Size = new System.Drawing.Size(148, 25);
+            this.cmbHot.Size = new System.Drawing.Size(147, 25);
             this.cmbHot.TabIndex = 882;
             this.cmbHot.Text = "普通商品";
             this.cmbHot.Visible = false;
@@ -369,7 +369,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblHot.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblHot.AutoSize = true;
-            this.lblHot.Location = new System.Drawing.Point(877, 9);
+            this.lblHot.Location = new System.Drawing.Point(874, 9);
             this.lblHot.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblHot.Name = "lblHot";
             this.lblHot.Size = new System.Drawing.Size(44, 17);
@@ -384,7 +384,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.Location = new System.Drawing.Point(1075, 5);
+            this.btnSearch.Location = new System.Drawing.Point(1071, 5);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(51, 25);
             this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -408,9 +408,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnEmpty.Location = new System.Drawing.Point(1132, 5);
+            this.btnEmpty.Location = new System.Drawing.Point(1128, 5);
             this.btnEmpty.Name = "btnEmpty";
-            this.btnEmpty.Size = new System.Drawing.Size(58, 25);
+            this.btnEmpty.Size = new System.Drawing.Size(62, 25);
             this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
             this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -435,10 +435,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat3.DropDownWidth = 1;
             this.cmbCat3.FormattingEnabled = true;
             this.cmbCat3.IntegralHeight = false;
-            this.cmbCat3.Location = new System.Drawing.Point(723, 7);
+            this.cmbCat3.Location = new System.Drawing.Point(721, 7);
             this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat3.Name = "cmbCat3";
-            this.cmbCat3.Size = new System.Drawing.Size(148, 25);
+            this.cmbCat3.Size = new System.Drawing.Size(147, 25);
             this.cmbCat3.TabIndex = 811;
             this.cmbCat3.Text = "全部";
             this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged);
@@ -448,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(672, 9);
+            this.label17.Location = new System.Drawing.Point(670, 9);
             this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label17.Name = "label17";
             this.label17.Size = new System.Drawing.Size(51, 17);
@@ -463,7 +463,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat2.DropDownWidth = 1;
             this.cmbCat2.FormattingEnabled = true;
             this.cmbCat2.IntegralHeight = false;
-            this.cmbCat2.Location = new System.Drawing.Point(519, 7);
+            this.cmbCat2.Location = new System.Drawing.Point(517, 7);
             this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat2.Name = "cmbCat2";
             this.cmbCat2.Size = new System.Drawing.Size(147, 25);
@@ -476,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label14.AutoSize = true;
-            this.label14.Location = new System.Drawing.Point(468, 9);
+            this.label14.Location = new System.Drawing.Point(466, 9);
             this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(51, 17);
@@ -491,10 +491,10 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbCat1.DropDownWidth = 1;
             this.cmbCat1.FormattingEnabled = true;
             this.cmbCat1.IntegralHeight = false;
-            this.cmbCat1.Location = new System.Drawing.Point(295, 5);
+            this.cmbCat1.Location = new System.Drawing.Point(294, 7);
             this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbCat1.Name = "cmbCat1";
-            this.cmbCat1.Size = new System.Drawing.Size(148, 25);
+            this.cmbCat1.Size = new System.Drawing.Size(147, 25);
             this.cmbCat1.TabIndex = 805;
             this.cmbCat1.Text = "全部";
             this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged);
@@ -504,7 +504,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(244, 9);
+            this.label2.Location = new System.Drawing.Point(243, 9);
             this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(51, 17);
@@ -517,7 +517,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.txtProdName.Location = new System.Drawing.Point(71, 6);
             this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(148, 23);
+            this.txtProdName.Size = new System.Drawing.Size(147, 23);
             this.txtProdName.TabIndex = 427;
             // 
             // label3
@@ -551,17 +551,17 @@ namespace TemuKJD.WXForms.ProductForms
             "安全+未校验",
             "安全商品",
             "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(71, 40);
+            this.cmbWxSafe.Location = new System.Drawing.Point(71, 42);
             this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbWxSafe.Name = "cmbWxSafe";
-            this.cmbWxSafe.Size = new System.Drawing.Size(148, 25);
+            this.cmbWxSafe.Size = new System.Drawing.Size(147, 25);
             this.cmbWxSafe.TabIndex = 676;
             this.cmbWxSafe.Text = "安全+未校验";
             // 
             // chkCatBoundMoreThan
             // 
             this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkCatBoundMoreThan.Location = new System.Drawing.Point(228, 42);
+            this.chkCatBoundMoreThan.Location = new System.Drawing.Point(227, 42);
             this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan";
             this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21);
@@ -573,10 +573,10 @@ namespace TemuKJD.WXForms.ProductForms
             // txtCatBoundMoreThan
             // 
             this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCatBoundMoreThan.Location = new System.Drawing.Point(295, 41);
+            this.txtCatBoundMoreThan.Location = new System.Drawing.Point(294, 41);
             this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan";
-            this.txtCatBoundMoreThan.Size = new System.Drawing.Size(148, 23);
+            this.txtCatBoundMoreThan.Size = new System.Drawing.Size(147, 23);
             this.txtCatBoundMoreThan.TabIndex = 882;
             this.txtCatBoundMoreThan.Text = "1000";
             this.txtCatBoundMoreThan.Visible = false;
@@ -584,7 +584,7 @@ namespace TemuKJD.WXForms.ProductForms
             // chkCatBoundLessThan
             // 
             this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.chkCatBoundLessThan.Location = new System.Drawing.Point(452, 42);
+            this.chkCatBoundLessThan.Location = new System.Drawing.Point(450, 42);
             this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.chkCatBoundLessThan.Name = "chkCatBoundLessThan";
             this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21);
@@ -596,7 +596,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtCatBoundLessThan
             // 
             this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCatBoundLessThan.Location = new System.Drawing.Point(519, 41);
+            this.txtCatBoundLessThan.Location = new System.Drawing.Point(517, 41);
             this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtCatBoundLessThan.Name = "txtCatBoundLessThan";
             this.txtCatBoundLessThan.Size = new System.Drawing.Size(147, 23);
@@ -608,10 +608,10 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(921, 42);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(918, 42);
             this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
-            this.cmbGroupFilter.Size = new System.Drawing.Size(148, 25);
+            this.cmbGroupFilter.Size = new System.Drawing.Size(147, 25);
             this.cmbGroupFilter.TabIndex = 653;
             this.cmbGroupFilter.Visible = false;
             this.cmbGroupFilter.SelectedIndexChanged += new System.EventHandler(this.cmbGroupFilter_SelectedIndexChanged);
@@ -620,7 +620,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblSourceType.AutoSize = true;
-            this.lblSourceType.Location = new System.Drawing.Point(679, 44);
+            this.lblSourceType.Location = new System.Drawing.Point(677, 44);
             this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblSourceType.Name = "lblSourceType";
             this.lblSourceType.Size = new System.Drawing.Size(44, 17);
@@ -632,7 +632,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.lblGroupFilter.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.lblGroupFilter.AutoSize = true;
-            this.lblGroupFilter.Location = new System.Drawing.Point(877, 44);
+            this.lblGroupFilter.Location = new System.Drawing.Point(874, 44);
             this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblGroupFilter.Name = "lblGroupFilter";
             this.lblGroupFilter.Size = new System.Drawing.Size(44, 17);
@@ -655,10 +655,10 @@ namespace TemuKJD.WXForms.ProductForms
             "机会商品",
             "以图搜品",
             "外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(723, 42);
+            this.cmbSourceType.Location = new System.Drawing.Point(721, 42);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
-            this.cmbSourceType.Size = new System.Drawing.Size(148, 25);
+            this.cmbSourceType.Size = new System.Drawing.Size(147, 25);
             this.cmbSourceType.TabIndex = 654;
             this.cmbSourceType.Text = "厂商直采";
             this.cmbSourceType.Visible = false;