diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs index f85aae2..c9cc890 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUploadForm.cs @@ -8070,7 +8070,7 @@ Content-Type: image/jpeg { if (valItem.vid == null) { - var valTemp = propTemp.values.content.FirstOrDefault(c => c.value == valItem.value); + var valTemp = propTemp.values?.content?.FirstOrDefault(c => c.value == valItem.value); if (valTemp != null) valItem.vid = valTemp.vid; } @@ -8271,7 +8271,7 @@ Content-Type: image/jpeg { if (propTemp.required && !goods_properties.Any(p => p.ref_pid == propTemp.ref_pid)) { - var contentOther = propTemp.values.content.FirstOrDefault(c => c.value == "其他"); + var contentOther = propTemp.values?.content?.FirstOrDefault(c => c.value == "其他"); if (contentOther != null) { //var prop = new goods_property_param() diff --git a/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.Designer.cs index 4d74fbb..6333faa 100644 --- a/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.Designer.cs @@ -194,11 +194,11 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer1.Panel1.Controls.Add(this.cmbHasFission); this.splitContainer1.Panel1.Controls.Add(this.lblHasFission); this.splitContainer1.Panel1.Controls.Add(this.cmbRelation); - this.splitContainer1.Panel1.Controls.Add(this.lblRelation); this.splitContainer1.Panel1.Controls.Add(this.btnSelect); this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); this.splitContainer1.Panel1.Controls.Add(this.lblSetShop); this.splitContainer1.Panel1.Controls.Add(this.chkFissionProduct); + this.splitContainer1.Panel1.Controls.Add(this.lblRelation); // // splitContainer1.Panel2 // @@ -1703,13 +1703,16 @@ namespace TemuKJD.WXForms.ProductForms this.ucSplitPage1.CurrentPage = 1; this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; this.ucSplitPage1.IsShowPageSize = true; + this.ucSplitPage1.IsShowTotalCount = false; this.ucSplitPage1.Location = new System.Drawing.Point(985, 0); this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.MaxPageSizeValue = 5000; this.ucSplitPage1.Name = "ucSplitPage1"; this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); this.ucSplitPage1.PageSize = 100; this.ucSplitPage1.Size = new System.Drawing.Size(453, 25); this.ucSplitPage1.TabIndex = 6; + this.ucSplitPage1.TotalCount = ((long)(0)); this.ucSplitPage1.TotalPage = 1; // // statusBar @@ -1877,5 +1880,5 @@ namespace TemuKJD.WXForms.ProductForms private UserComponent.UcCheckBox chkFissionProduct; private System.Windows.Forms.ComboBox cmbHasFission; private System.Windows.Forms.Label lblHasFission; - } + } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs index c08d628..f3d51ab 100644 --- a/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXSelectDBProdListForm.cs @@ -142,7 +142,14 @@ namespace TemuKJD.WXForms.ProductForms ucSplitPage1.cmbPageSize.DropDownStyle = ComboBoxStyle.DropDownList; ucSplitPage1.cmbPageSize.SelectedIndex = 0; - if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.ParseToString().Contains("货源选择")) + if (BaseClass.MainPath == "29pdd") + { + lblRelation.Visible = true; + cmbRelation.Visible = true; + cmbRelation.Text = "是"; + } + + if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.ParseToString().Contains("货源选择")) { lblSourceType.Visible = true; cmbSourceType.Visible = true; @@ -150,7 +157,7 @@ namespace TemuKJD.WXForms.ProductForms { lblGroupFilter.Visible = true; cmbGroupFilter.Visible = true; - } + } } if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.ParseToString().Contains("爆款数据")) { @@ -651,8 +658,14 @@ namespace TemuKJD.WXForms.ProductForms this.pbLoading.Visible = true; SearchDbProd(this.ucSplitPage1.CurrentPage); - } - } + } + if (BaseClass.MainPath == "29pdd") + { + lblRelation.Visible = true; + cmbRelation.Visible = true; + //cmbRelation.Text = "是"; + } + } private void UcSplitPage1_PageChange(object obj) { @@ -928,14 +941,30 @@ namespace TemuKJD.WXForms.ProductForms selectProd.is_fission_title = true; selectProd.out_product_Id = prod.id.ToString(); selectProd.id = 1; - if (WXDBProdUploadForm.lstTemuDBProductSelect.Count > 0) - selectProd.id = WXDBProdUploadForm.lstTemuDBProductSelect.Max(p => p.id) + 1; - WXDBProdUploadForm.lstTemuDBProductSelect.Add(selectProd); + + if (BaseClass.MainPath == "29pdd") + { + if (lstTemuDBProductSelect.Count > 0) + selectProd.id = lstTemuDBProductSelect.Max(p => p.id) + 1; + lstTemuDBProductSelect.Add(selectProd); + } + else + { + if (WXDBProdUploadForm.lstTemuDBProductSelect.Count > 0) + selectProd.id = WXDBProdUploadForm.lstTemuDBProductSelect.Max(p => p.id) + 1; + WXDBProdUploadForm.lstTemuDBProductSelect.Add(selectProd); + } } } - this.OnSaveComplete(lstTemuDBProductSelect); - } + //if (BaseClass.MainPath == "29pdd") + //{ + // NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_db_prod_upload_list", WXDBProdUploadForm.lstTemuDBProductSelect); + //} + //this.OnSaveComplete(WXDBProdUploadForm.lstTemuDBProductSelect); + + this.OnSaveComplete(lstTemuDBProductSelect); + } private void dgvDbProduct_Scroll(object sender, ScrollEventArgs e) {