1库存上传可以修改类目, 2修复选品上传标题内有中文导致无法上传问题 3商品核价过滤优化

This commit is contained in:
wule committed 2025-11-21 18:46:14 +08:00
1 parent 55d4a27d90
commit a23020725a
10 files changed
+945 -606

No files matched your search

+1 -1
View File
@@ -27,7 +27,7 @@ namespace AllBase
/// <summary> /// <summary>
/// 版本ID /// 版本ID
/// </summary> /// </summary>
public static int VersionCount = 685; public static int VersionCount = 687;
//public static int VersionCount = 613; //public static int VersionCount = 613;
/// <summary> /// <summary>
@@ -548,10 +548,18 @@ namespace TemuKJD.Extension
{ {
ShowDgvImg(dgv, null, imgColumn, imgPathColumn, isSetHttpsHttp); ShowDgvImg(dgv, null, imgColumn, imgPathColumn, isSetHttpsHttp);
}; };
dgv.RowsRemoved += (s, e) =>
{
ShowDgvImg(dgv, null, imgColumn, imgPathColumn, isSetHttpsHttp);
};
dgv.RowsAdded += (s, e) => dgv.RowsAdded += (s, e) =>
{ {
ShowDgvImg(dgv, new ConcurrentList<DataGridViewRow> { dgv.Rows[e.RowIndex] }, imgColumn, imgPathColumn, isSetHttpsHttp); ShowDgvImg(dgv, new ConcurrentList<DataGridViewRow> { dgv.Rows[e.RowIndex] }, imgColumn, imgPathColumn, isSetHttpsHttp);
}; };
dgv.RowPostPaint += (s, e) =>
{
ShowDgvImg(dgv, new ConcurrentList<DataGridViewRow> { dgv.Rows[e.RowIndex] }, imgColumn, imgPathColumn, isSetHttpsHttp);
};
dgv.CellValueChanged += (s, e) => dgv.CellValueChanged += (s, e) =>
{ {
if (dgv.Columns[e.ColumnIndex].Name == imgPathColumn) if (dgv.Columns[e.ColumnIndex].Name == imgPathColumn)
File diff suppressed because it is too large. Load diff
@@ -25,6 +25,7 @@ namespace TemuKJD.KJDForms.AdminForms
public partial class AdminProductPriceCheckForm : Form public partial class AdminProductPriceCheckForm : Form
{ {
PriceCheckConfig priceCheckConfig = null; PriceCheckConfig priceCheckConfig = null;
List<PriceCheckFilterConfig> lstPriceCheckFilterConfig = new List<PriceCheckFilterConfig>();
public CancellationTokenSource cancellationTokenSource { get; set; } = null; public CancellationTokenSource cancellationTokenSource { get; set; } = null;
public List<ShopLoginInfo> lstAdminShopInfo { get; set; } = new List<ShopLoginInfo>(); public List<ShopLoginInfo> lstAdminShopInfo { get; set; } = new List<ShopLoginInfo>();
public List<TemuForChainProductInfo> lstCheckPriceInfo = new List<TemuForChainProductInfo>(); public List<TemuForChainProductInfo> lstCheckPriceInfo = new List<TemuForChainProductInfo>();
@@ -36,9 +37,14 @@ namespace TemuKJD.KJDForms.AdminForms
private void AdminProductPriceCheckForm_Load(object sender, EventArgs e) private void AdminProductPriceCheckForm_Load(object sender, EventArgs e)
{ {
lstPriceCheckFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig<List<PriceCheckFilterConfig>>("price_check_filter_config");
if (lstPriceCheckFilterConfig == null)
lstPriceCheckFilterConfig = new List<PriceCheckFilterConfig>();
this.dgvShop.AddSelectorColumn("colSelect"); this.dgvShop.AddSelectorColumn("colSelect");
this.dgvPriceCheck.AddSelectorColumn("colCheck"); this.dgvPriceCheck.AddSelectorColumn("colCheck");
this.dgvPriceCheck.AddMergeColumnHeader(new List<string>() { "colOk", "colCancel" }, "同意/拒绝报价"); this.dgvPriceCheck.AddMergeColumnHeader(new List<string>() { "colOk", "colCancel" }, "同意/拒绝报价");
this.dgvPriceCheck.AddImgColumn("colProductSkcPic", "colImgUrl");
this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1); this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1);
this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7); this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7);
@@ -259,13 +265,13 @@ namespace TemuKJD.KJDForms.AdminForms
{ {
case "规格名称": case "规格名称":
{ {
var PriceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId); var priceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId);
if (PriceInfo != null) if (priceInfo != null)
{ {
this.pnlSpecDetail.Visible = true; this.pnlSpecDetail.Visible = true;
string skuName = ""; string skuName = "";
var prodSkuList = PriceInfo.skcList.FirstOrDefault().skuList; var prodSkuList = priceInfo.skcList.FirstOrDefault().skuList;
if (prodSkuList != null) if (prodSkuList != null)
{ {
foreach (var sku in prodSkuList) foreach (var sku in prodSkuList)
@@ -509,7 +515,9 @@ namespace TemuKJD.KJDForms.AdminForms
private void btnSearchPrice_Click(object sender, EventArgs e) private void btnSearchPrice_Click(object sender, EventArgs e)
{ {
this.pnlDetailOperate1.Visible = true; this.pnlDetailOperate1.Visible = true;
this.pnlDetailOperate2.Visible = false; this.btnMutliOk.Visible = true;
this.btnMutliCancel.Visible = true;
this.pnlMutliCancelWithTitleWrong.Visible = false;
this.dgvPriceCheck.Columns["colOk"].Visible = true; this.dgvPriceCheck.Columns["colOk"].Visible = true;
this.dgvPriceCheck.Columns["colCancel"].Visible = true; this.dgvPriceCheck.Columns["colCancel"].Visible = true;
this.dgvPriceCheck.Columns["colCancelWithTitleWrong"].Visible = false; this.dgvPriceCheck.Columns["colCancelWithTitleWrong"].Visible = false;
@@ -518,9 +526,11 @@ namespace TemuKJD.KJDForms.AdminForms
private void btnSearchPrice2_Click(object sender, EventArgs e) private void btnSearchPrice2_Click(object sender, EventArgs e)
{ {
this.pnlDetailOperate2.Location = this.pnlDetailOperate1.Location;
this.pnlDetailOperate1.Visible = false; this.pnlDetailOperate1.Visible = false;
this.pnlDetailOperate2.Visible = true; this.btnMutliOk.Visible = false;
this.btnMutliCancel.Visible = false;
this.pnlMutliCancelWithTitleWrong.Visible = true;
this.pnlMutliCancelWithTitleWrong.Location = btnMutliOk.Location;
this.dgvPriceCheck.Columns["colOk"].Visible = false; this.dgvPriceCheck.Columns["colOk"].Visible = false;
this.dgvPriceCheck.Columns["colCancel"].Visible = false; this.dgvPriceCheck.Columns["colCancel"].Visible = false;
this.dgvPriceCheck.Columns["colCancelWithTitleWrong"].Visible = true; this.dgvPriceCheck.Columns["colCancelWithTitleWrong"].Visible = true;
@@ -546,7 +556,7 @@ namespace TemuKJD.KJDForms.AdminForms
} }
} }
this.chkFilter.Checked = false; this.chkFilterTitle.Checked = false;
this.dgvPriceCheck.Rows.Clear(); this.dgvPriceCheck.Rows.Clear();
this.lstCheckPriceInfo.Clear(); this.lstCheckPriceInfo.Clear();
this.pbLoading.Visible = true; this.pbLoading.Visible = true;
@@ -605,7 +615,7 @@ namespace TemuKJD.KJDForms.AdminForms
if (jArr == null) if (jArr == null)
jArr = new JArray(); jArr = new JArray();
List<string> extCodeLst = new List<string>(); List<string> extCodeTmpLst = new List<string>();
List<TemuForChainProductInfo> checkPriceInfoTmpLst = new List<TemuForChainProductInfo>(); List<TemuForChainProductInfo> checkPriceInfoTmpLst = new List<TemuForChainProductInfo>();
foreach (var item in jArr) foreach (var item in jArr)
{ {
@@ -613,12 +623,12 @@ namespace TemuKJD.KJDForms.AdminForms
TemuForChainProductInfo priceInfo = JsonHelper.DeserializeJsonToObject<TemuForChainProductInfo>(jStr); TemuForChainProductInfo priceInfo = JsonHelper.DeserializeJsonToObject<TemuForChainProductInfo>(jStr);
lstCheckPriceInfo.Add(priceInfo); lstCheckPriceInfo.Add(priceInfo);
checkPriceInfoTmpLst.Add(priceInfo); checkPriceInfoTmpLst.Add(priceInfo);
extCodeLst.Add(priceInfo.skcList.FirstOrDefault()?.extCode); extCodeTmpLst.Add(priceInfo.skcList.FirstOrDefault()?.extCode);
} }
List<TemuDBExtCodePriceInfo> extCodePriceList = new List<TemuDBExtCodePriceInfo>(); List<TemuDBExtCodePriceInfo> extCodePriceList = new List<TemuDBExtCodePriceInfo>();
try try
{ {
extCodePriceList = GetServerExtCodePriceLst(extCodeLst.Distinct().ToList()); extCodePriceList = GetServerExtCodePriceLst(extCodeTmpLst.Distinct().ToList());
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -686,7 +696,7 @@ namespace TemuKJD.KJDForms.AdminForms
//else //else
// suggestSupplyPrice += "¥"; // suggestSupplyPrice += "¥";
suggestSupplyPrice = (reviewInfo.suggestSupplyPrice / 100.0).ToString() + "¥"; suggestSupplyPrice = "¥" + (reviewInfo.suggestSupplyPrice.ParseToDecimal() / 100).ToString("0.00");
} }
var reviewExtCode = priceInfo.skcList.FirstOrDefault()?.extCode; var reviewExtCode = priceInfo.skcList.FirstOrDefault()?.extCode;
var extCodePrice = extCodePriceList.FirstOrDefault(p => reviewExtCode == p.ext_code); var extCodePrice = extCodePriceList.FirstOrDefault(p => reviewExtCode == p.ext_code);
@@ -700,17 +710,15 @@ namespace TemuKJD.KJDForms.AdminForms
priceInfo.supplierId, priceInfo.supplierId,
priceInfo.supplierName, priceInfo.supplierName,
imgUrl, imgUrl,
defaultBitmap, DataGridViewExtension.defaultBitmap,
priceInfo.productId, priceInfo.productId,
priceInfo.skcList.FirstOrDefault()?.skcId, priceInfo.skcList.FirstOrDefault()?.skcId,
priceInfo.productName, priceInfo.productName,
skuName, skuName,
reviewExtCode, reviewExtCode,
extCodePrice == null ? "-" : (extCodePrice.original_price / 100.0).ParseToString(), extCodePrice?.original_price / 100m, //extCodePrice == null ? "-" : (extCodePrice.original_price / 100m).ParseToString(),
// sku不同价的会被分成多个review,priceInfo此时为价格范围 reviewInfo.supplyPrice / 100m, //reviewInfo.productSkuList.FirstOrDefault()?.supplierPrice, //priceInfo.supplierPrice // sku不同价的会被分成多个review,priceInfo此时为价格范围
reviewInfo.productSkuList.FirstOrDefault()?.supplierPrice, //priceInfo.supplierPrice reviewInfo.suggestSupplyPrice / 100m, //suggestSupplyPrice.ParseToDecimal(),//核价 //reviewInfo.suggestSupplyPrice == null ? "-" : reviewInfo.suggestSupplyPrice.ParseToString(),
suggestSupplyPrice,//核价
//reviewInfo.suggestSupplyPrice == null ? "-" : reviewInfo.suggestSupplyPrice.ParseToString(),
"", //新报价 "", //新报价
reviewInfo.times, // 修改报价次数 reviewInfo.times, // 修改报价次数
BaseClass.StampToDateTime((priceInfo.skcList.FirstOrDefault()?.statusTime.createdTime.ParseToLong() / 1000).ParseToInt()).ToString("yy/MM/dd HH:mm:ss"), BaseClass.StampToDateTime((priceInfo.skcList.FirstOrDefault()?.statusTime.createdTime.ParseToLong() / 1000).ParseToInt()).ToString("yy/MM/dd HH:mm:ss"),
@@ -720,21 +728,47 @@ namespace TemuKJD.KJDForms.AdminForms
"" ""
); ; ); ;
dgvPriceCheck.Rows[rowId].Height = 60; dgvPriceCheck.Rows[rowId].Height = 60;
if (chkFilter.Checked && !CheckContainsWords(priceInfo.productName)) //if (dgvPriceCheck.Rows[rowId].Cells["colExtCodePrice"].Value.ParseToString().IsNullOrEmpty())
{ // dgvPriceCheck.Rows[rowId].Cells["colExtCodePrice"].Value = "-";
dgvPriceCheck.Rows[rowId].Visible = false; if (CheckRestoreTitleWords(priceInfo.productName))
}
if (checkRestoreSizeAndNumber(priceInfo))
{ {
dgvPriceCheck.Rows[rowId].Cells["colProdName"].Style.ForeColor = Color.Red; dgvPriceCheck.Rows[rowId].Cells["colProdName"].Style.ForeColor = Color.Red;
} }
else else
{ {
dgvPriceCheck.Rows[rowId].Cells["colProdName"].Style.ForeColor = dgvPriceCheck.DefaultCellStyle.ForeColor; dgvPriceCheck.Rows[rowId].Cells["colProdName"].Style.ForeColor = dgvPriceCheck.DefaultCellStyle.ForeColor;
if (chkFilterTitle.Checked)
dgvPriceCheck.Rows[rowId].Visible = false;
}
if (checkRestoreSizeAndNumber(priceInfo))
{
dgvPriceCheck.Rows[rowId].Cells["colSkuName"].Style.ForeColor = Color.Red;
}
else
{
dgvPriceCheck.Rows[rowId].Cells["colSkuName"].Style.ForeColor = dgvPriceCheck.DefaultCellStyle.ForeColor;
}
if (totalProdIndex % 2 == 1)
dgvPriceCheck.Rows[rowId].DefaultCellStyle.BackColor = Color.White;
else
dgvPriceCheck.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke;
var extCodeLst = this.dgvPriceCheck.Rows.Cast<DataGridViewRow>()
.Select(r => r.Cells["colExtCode"].Value.ParseToString())
.Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
this.dgvExtCode.Rows.Clear();
foreach (var ext in extCodeLst)
{
var filterConfig = lstPriceCheckFilterConfig.FirstOrDefault(c => c.ExtCode == ext);
var pos = this.dgvExtCode.Rows.Add(
false,
ext,
filterConfig == null ? "" : GetConfigDesStr(filterConfig.Symbol, filterConfig.Price1, filterConfig.Price2)
);
} }
})); }));
} }
this.ShowDgvImg();
} }
} }
catch (Exception ex) catch (Exception ex)
@@ -895,60 +929,6 @@ namespace TemuKJD.KJDForms.AdminForms
return HttpResponseBLL.PostResponse2(shop, url, body, referer); return HttpResponseBLL.PostResponse2(shop, url, body, referer);
} }
Bitmap defaultBitmap = new Bitmap(80, 80);
void ShowDgvImg()
{
Task.Run(() =>
{
foreach (DataGridViewRow row in this.dgvPriceCheck.Rows)
{
if (row.Index > 0 && row.Cells["colProductSkcPic"].Displayed == false)
{
try
{
Invoke(new Action(() =>
{
row.Cells["colProductSkcPic"].Value = defaultBitmap;
}));
}
catch
{
}
continue;
}
if (row.Cells["colProductSkcPic"].Value != null && row.Cells["colProductSkcPic"].Value != defaultBitmap)
continue;
Image image = null;
string imgUrl = row.Cells["colImgUrl"]?.Value.ParseToString();
string getImgError = "";
if (!string.IsNullOrWhiteSpace(imgUrl))
image = GetHtml.GetUrlImg(imgUrl, out getImgError);
if (!string.IsNullOrEmpty(getImgError))
//BaseMsgForm.ShowError("图片加载失败 " + getImgError);
image = TemuKJD.Properties.Resources.errpic;
try
{
Invoke(new Action(() =>
{
if (dgvPriceCheck.Rows.Contains(row))
row.Cells["colProductSkcPic"].Value = image;
}));
}
catch
{
}
}
});
}
private void dgvPriceCheck_Scroll(object sender, ScrollEventArgs e)
{
this.ShowDgvImg();
}
private void btnRestoreProdName_Click(object sender, EventArgs e) private void btnRestoreProdName_Click(object sender, EventArgs e)
{ {
var products = this.dgvPriceCheck.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true) var products = this.dgvPriceCheck.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true)
@@ -982,7 +962,7 @@ namespace TemuKJD.KJDForms.AdminForms
} }
var pName = price.productName; var pName = price.productName;
if (CheckContainsWords(pName)) if (CheckRestoreTitleWords(pName))
{ {
} }
else else
@@ -1261,31 +1241,9 @@ namespace TemuKJD.KJDForms.AdminForms
}); });
} }
private void chkFilter_CheckedChanged(object sender, EventArgs e) private void chkFilterTitle_CheckedChanged(object sender, EventArgs e)
{ {
if (chkFilter.Checked == false) FilterRows();
{
foreach (DataGridViewRow row in dgvPriceCheck.Rows)
{
row.Visible = true;
}
}
else
{
foreach (DataGridViewRow row in dgvPriceCheck.Rows)
{
var pName = row.Cells["colProdName"].Value.ParseToString();
if (CheckContainsWords(pName))
{
}
else
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
}
}
}
} }
bool MouseLeftButtonDown = false; bool MouseLeftButtonDown = false;
@@ -1377,7 +1335,7 @@ namespace TemuKJD.KJDForms.AdminForms
} }
} }
bool CheckContainsWords(string filterProdName) bool CheckRestoreTitleWords(string filterProdName)
{ {
return filterProdName != RestoreProductName(filterProdName); return filterProdName != RestoreProductName(filterProdName);
} }
@@ -1744,6 +1702,208 @@ namespace TemuKJD.KJDForms.AdminForms
{ {
this.txtExtCode.Text = this.txtSkcId.Text = ""; this.txtExtCode.Text = this.txtSkcId.Text = "";
} }
private void dgvExtCode_CellContentClick(object sender, DataGridViewCellEventArgs e)
{
if (e.ColumnIndex < 0 || e.RowIndex < 0)
return;
string headerText = dgvExtCode.Columns[e.ColumnIndex].HeaderText;
var row = dgvExtCode.Rows[e.RowIndex];
switch (headerText)
{
case "":
case "选":
case "货号":
row.Cells["colSelectExtCode"].Value = !row.Cells["colSelectExtCode"].Value.ParseToBool();
FilterRows();
break;
}
}
void FilterRows()
{
var filterExtCodeLst = dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
foreach (DataGridViewRow row in dgvPriceCheck.Rows)
{
row.Visible = true;
row.Cells["colCheck"].Value = false;
//continue;
var prodId = row.Cells["colProductId"].Value.ParseToString();
var rowExtCode = row.Cells["colExtCode"].Value.ParseToString();
var rowAdjustPrice = row.Cells["colAdjustPrice"].Value.ParseToDecimal();
// 过滤价格
// 只有有选中数据时才过滤,全不选时不过滤
if (filterExtCodeLst != null && filterExtCodeLst.Count > 0)
{
var filterExtCode = filterExtCodeLst.FirstOrDefault(e => e == rowExtCode);
var filterExtCodeConfig = lstPriceCheckFilterConfig.FirstOrDefault(c => c.ExtCode == rowExtCode);
if (string.IsNullOrWhiteSpace(filterExtCode))
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
}
else if (filterExtCodeConfig != null)
{
if (filterExtCodeConfig.Symbol == "≥" && rowAdjustPrice < filterExtCodeConfig.Price1)
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
}
if (filterExtCodeConfig.Symbol == "≤" && rowAdjustPrice > filterExtCodeConfig.Price1)
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
}
if (filterExtCodeConfig.Symbol.StartsWith("≤") && filterExtCodeConfig.Symbol.EndsWith("≥") &&
rowAdjustPrice > filterExtCodeConfig.Price1 && rowAdjustPrice < filterExtCodeConfig.Price2)
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
}
if (filterExtCodeConfig.Symbol.StartsWith("≥") && filterExtCodeConfig.Symbol.EndsWith("≤") &&
(rowAdjustPrice < filterExtCodeConfig.Price1 || rowAdjustPrice > filterExtCodeConfig.Price2))
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
}
}
}
// 过滤保留未还原的标题
if (chkFilterTitle.Checked)
{
var pName = row.Cells["colProdName"].Value.ParseToString();
if (!CheckRestoreTitleWords(pName))
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
}
else
{
}
}
if (ucCheckBox1.Checked)
{
var priceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId);
if (priceInfo != null)
{
if (!checkRestoreSizeAndNumber(priceInfo))
{
row.Cells["colCheck"].Value = false;
row.Visible = false;
}
else
{
}
}
}
}
}
private void btnSaveFilterParams_Click(object sender, EventArgs e)
{
var rows = this.dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true).ToList();
var extCodeLst = rows.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
if (extCodeLst.Count == 0)
{
BaseMsgForm.ShowError("请查询商品后在左边列表选择货号!");
return;
}
decimal price1 = txtPrice1.Text.ParseToDecimal();
decimal price2 = txtPrice2.Text.ParseToDecimal();
if ((cmbSymbol.Text == "≤ ≥" || cmbSymbol.Text == "≥ ≤") && price2 < price1)
{
BaseMsgForm.ShowError("高价格不能小于低价格");
return;
}
foreach (var extCode in extCodeLst)
{
lstPriceCheckFilterConfig.RemoveAll(p => p.ExtCode == extCode);
var priceParam = new PriceCheckFilterConfig()
{
ExtCode = extCode,
Symbol = cmbSymbol.Text,
Price1 = txtPrice1.Text.Trim().ParseToDecimal(),
Price2 = txtPrice2.Text.Trim().ParseToDecimal(),
};
lstPriceCheckFilterConfig.Add(priceParam);
}
NaiBa.Util.Helper.ConfigHelper.SaveConfig("price_check_filter_config", lstPriceCheckFilterConfig);
BaseMsgForm.ShowInfo("选中货号的价格过滤配置已保存!");
foreach (var row in rows)
{
row.Cells["colFilterRule"].Value = GetConfigDesStr(cmbSymbol.Text.Trim(), txtPrice1.Text.Trim().ParseToDecimal(), txtPrice2.Text.Trim().ParseToDecimal());
}
FilterRows();
}
string GetConfigDesStr(string symbol, decimal price1, decimal price2)
{
if (symbol == "≤")
return "≤" + price1;
else if (symbol == "≥ ≤")
return "≥" + price1 + " 且 ≤" + price2;
else if (symbol == "≤ ≥")
return "≤" + price1 + " 或 ≥" + price2;
return "≥" + price1.ToString();
}
private void btnRestoreFilterParams_Click(object sender, EventArgs e)
{
var rows = this.dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true).ToList();
var extCodeLst = rows.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
if (extCodeLst.Count == 0)
{
BaseMsgForm.ShowError("请查询商品后在左边列表选择货号!");
return;
}
if (BaseMsgForm.ShowConfirm("确定要清除选中货号的价格过滤配置吗?", "提示").DialogResult == DialogResult.OK)
{
foreach (var extCode in extCodeLst)
{
lstPriceCheckFilterConfig.RemoveAll(p => p.ExtCode == extCode);
}
NaiBa.Util.Helper.ConfigHelper.SaveConfig("price_check_filter_config", lstPriceCheckFilterConfig);
BaseMsgForm.ShowInfo("选中货号的价格过滤配置已清除!");
foreach (var row in rows)
{
row.Cells["colFilterRule"].Value = "";
}
}
FilterRows();
}
private void cmbSymbol_TextChanged(object sender, EventArgs e)
{
if (cmbSymbol.Text == "≤ ≥" || cmbSymbol.Text == "≥ ≤")
{
txtPrice2.Visible = true;
label16.Visible = true;
}
else
{
txtPrice2.Visible = false;
label16.Visible = false;
}
}
private void chkFilterSize_CheckedChanged(object sender, EventArgs e)
{
FilterRows();
}
} }
public class PriceCheckConfig public class PriceCheckConfig
@@ -1757,4 +1917,12 @@ namespace TemuKJD.KJDForms.AdminForms
public string PriceDown { get; set; } = "0.1"; public string PriceDown { get; set; } = "0.1";
public bool SearchAllShop { get; set; } = true; public bool SearchAllShop { get; set; } = true;
} }
public class PriceCheckFilterConfig
{
public string ExtCode { get; set; }
public string Symbol { get; set; }
public decimal Price1 { get; set; }
public decimal Price2 { get; set; }
}
} }
@@ -117,6 +117,15 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="colSelectExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colFilterExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colFilterRule.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
+74 -127
View File
@@ -30,19 +30,19 @@ namespace TemuKJD.KJDForms.ProductForms
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnRestoreJitParams = new DevComponents.DotNetBar.PanelEx(); this.btnRestoreJitParams = new DevComponents.DotNetBar.PanelEx();
@@ -98,9 +98,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbShopLoading = new System.Windows.Forms.PictureBox(); this.pbShopLoading = new System.Windows.Forms.PictureBox();
this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.txtBatchExtCode = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.btnCancelJit = new DevComponents.DotNetBar.PanelEx();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -241,9 +238,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx1.Controls.Add(this.chkBatchStock); this.ucGroupBoxEx1.Controls.Add(this.chkBatchStock);
this.ucGroupBoxEx1.Controls.Add(this.chkBatchJit); this.ucGroupBoxEx1.Controls.Add(this.chkBatchJit);
this.ucGroupBoxEx1.Controls.Add(this.chkFilterJit); this.ucGroupBoxEx1.Controls.Add(this.chkFilterJit);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
this.ucGroupBoxEx1.Size = new System.Drawing.Size(1579, 140); this.ucGroupBoxEx1.Size = new System.Drawing.Size(1580, 140);
this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "参数设置"; this.ucGroupBoxEx1.Text = "参数设置";
@@ -253,9 +250,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRestoreJitParams.CanvasColor = System.Drawing.SystemColors.Control; this.btnRestoreJitParams.CanvasColor = System.Drawing.SystemColors.Control;
this.btnRestoreJitParams.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnRestoreJitParams.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRestoreJitParams.DisabledBackColor = System.Drawing.Color.Empty; this.btnRestoreJitParams.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestoreJitParams.Location = new System.Drawing.Point(1400, 103); this.btnRestoreJitParams.Location = new System.Drawing.Point(1341, 92);
this.btnRestoreJitParams.Name = "btnRestoreJitParams"; this.btnRestoreJitParams.Name = "btnRestoreJitParams";
this.btnRestoreJitParams.Size = new System.Drawing.Size(60, 23); this.btnRestoreJitParams.Size = new System.Drawing.Size(57, 35);
this.btnRestoreJitParams.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnRestoreJitParams.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestoreJitParams.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnRestoreJitParams.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnRestoreJitParams.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnRestoreJitParams.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -269,7 +266,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRestoreJitParams.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnRestoreJitParams.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestoreJitParams.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; this.btnRestoreJitParams.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnRestoreJitParams.TabIndex = 1303; this.btnRestoreJitParams.TabIndex = 1303;
this.btnRestoreJitParams.Text = "重置选中"; this.btnRestoreJitParams.Text = "清除选中\r\n货号配置";
this.btnRestoreJitParams.Click += new System.EventHandler(this.btnRestoreJitParams_Click); this.btnRestoreJitParams.Click += new System.EventHandler(this.btnRestoreJitParams_Click);
// //
// btnSaveExtCodeJitConfig // btnSaveExtCodeJitConfig
@@ -277,9 +274,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSaveExtCodeJitConfig.CanvasColor = System.Drawing.SystemColors.Control; this.btnSaveExtCodeJitConfig.CanvasColor = System.Drawing.SystemColors.Control;
this.btnSaveExtCodeJitConfig.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnSaveExtCodeJitConfig.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnSaveExtCodeJitConfig.DisabledBackColor = System.Drawing.Color.Empty; this.btnSaveExtCodeJitConfig.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSaveExtCodeJitConfig.Location = new System.Drawing.Point(1283, 103); this.btnSaveExtCodeJitConfig.Location = new System.Drawing.Point(1282, 92);
this.btnSaveExtCodeJitConfig.Name = "btnSaveExtCodeJitConfig"; this.btnSaveExtCodeJitConfig.Name = "btnSaveExtCodeJitConfig";
this.btnSaveExtCodeJitConfig.Size = new System.Drawing.Size(115, 23); this.btnSaveExtCodeJitConfig.Size = new System.Drawing.Size(57, 35);
this.btnSaveExtCodeJitConfig.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSaveExtCodeJitConfig.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSaveExtCodeJitConfig.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnSaveExtCodeJitConfig.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnSaveExtCodeJitConfig.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnSaveExtCodeJitConfig.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -293,7 +290,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSaveExtCodeJitConfig.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSaveExtCodeJitConfig.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSaveExtCodeJitConfig.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White; this.btnSaveExtCodeJitConfig.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnSaveExtCodeJitConfig.TabIndex = 1299; this.btnSaveExtCodeJitConfig.TabIndex = 1299;
this.btnSaveExtCodeJitConfig.Text = "存配置到选中货号"; this.btnSaveExtCodeJitConfig.Text = "保存选中\r\n货号配置\r\n";
this.btnSaveExtCodeJitConfig.Click += new System.EventHandler(this.btnSaveExtCodeJitConfig_Click); this.btnSaveExtCodeJitConfig.Click += new System.EventHandler(this.btnSaveExtCodeJitConfig_Click);
// //
// line3 // line3
@@ -311,7 +308,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.line2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.line2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.line2.Location = new System.Drawing.Point(1414, 21); this.line2.Location = new System.Drawing.Point(1414, 21);
this.line2.Name = "line2"; this.line2.Name = "line2";
this.line2.Size = new System.Drawing.Size(11, 59); this.line2.Size = new System.Drawing.Size(11, 104);
this.line2.TabIndex = 1264; this.line2.TabIndex = 1264;
this.line2.Text = "line2"; this.line2.Text = "line2";
this.line2.VerticalLine = true; this.line2.VerticalLine = true;
@@ -330,7 +327,7 @@ namespace TemuKJD.KJDForms.ProductForms
// //
this.chkFilterNotJit.AutoSize = true; this.chkFilterNotJit.AutoSize = true;
this.chkFilterNotJit.ForeColor = System.Drawing.Color.Green; this.chkFilterNotJit.ForeColor = System.Drawing.Color.Green;
this.chkFilterNotJit.Location = new System.Drawing.Point(1282, 70); this.chkFilterNotJit.Location = new System.Drawing.Point(1282, 66);
this.chkFilterNotJit.Name = "chkFilterNotJit"; this.chkFilterNotJit.Name = "chkFilterNotJit";
this.chkFilterNotJit.Size = new System.Drawing.Size(127, 21); this.chkFilterNotJit.Size = new System.Drawing.Size(127, 21);
this.chkFilterNotJit.TabIndex = 1232; this.chkFilterNotJit.TabIndex = 1232;
@@ -366,22 +363,22 @@ namespace TemuKJD.KJDForms.ProductForms
// //
this.dgvExtCode.AllowUserToAddRows = false; this.dgvExtCode.AllowUserToAddRows = false;
this.dgvExtCode.AllowUserToDeleteRows = false; this.dgvExtCode.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle25;
this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)));
this.dgvExtCode.AutoRowNumber = false; this.dgvExtCode.AutoRowNumber = false;
this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvExtCode.BackgroundColor = System.Drawing.Color.White; this.dgvExtCode.BackgroundColor = System.Drawing.Color.White;
this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle26.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26;
this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelectExtCode, this.colSelectExtCode,
this.colFilterExtCode, this.colFilterExtCode,
@@ -434,7 +431,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control; this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control;
this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty; this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty;
this.btnCancel.Location = new System.Drawing.Point(1470, 103); this.btnCancel.Location = new System.Drawing.Point(1471, 104);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(92, 23); this.btnCancel.Size = new System.Drawing.Size(92, 23);
this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -483,7 +480,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnAddRealPic.CanvasColor = System.Drawing.SystemColors.Control; this.btnAddRealPic.CanvasColor = System.Drawing.SystemColors.Control;
this.btnAddRealPic.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnAddRealPic.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnAddRealPic.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddRealPic.DisabledBackColor = System.Drawing.Color.Empty;
this.btnAddRealPic.Location = new System.Drawing.Point(1022, 103); this.btnAddRealPic.Location = new System.Drawing.Point(1024, 104);
this.btnAddRealPic.Name = "btnAddRealPic"; this.btnAddRealPic.Name = "btnAddRealPic";
this.btnAddRealPic.Size = new System.Drawing.Size(37, 23); this.btnAddRealPic.Size = new System.Drawing.Size(37, 23);
this.btnAddRealPic.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnAddRealPic.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -550,7 +547,7 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// txtBatchStock // txtBatchStock
// //
this.txtBatchStock.Location = new System.Drawing.Point(1188, 103); this.txtBatchStock.Location = new System.Drawing.Point(1188, 104);
this.txtBatchStock.Name = "txtBatchStock"; this.txtBatchStock.Name = "txtBatchStock";
this.txtBatchStock.Size = new System.Drawing.Size(80, 23); this.txtBatchStock.Size = new System.Drawing.Size(80, 23);
this.txtBatchStock.TabIndex = 1054; this.txtBatchStock.TabIndex = 1054;
@@ -567,7 +564,7 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// txtBatchIdentifyCode // txtBatchIdentifyCode
// //
this.txtBatchIdentifyCode.Location = new System.Drawing.Point(904, 103); this.txtBatchIdentifyCode.Location = new System.Drawing.Point(904, 104);
this.txtBatchIdentifyCode.Name = "txtBatchIdentifyCode"; this.txtBatchIdentifyCode.Name = "txtBatchIdentifyCode";
this.txtBatchIdentifyCode.Size = new System.Drawing.Size(87, 23); this.txtBatchIdentifyCode.Size = new System.Drawing.Size(87, 23);
this.txtBatchIdentifyCode.TabIndex = 1048; this.txtBatchIdentifyCode.TabIndex = 1048;
@@ -835,7 +832,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkBatchIdentifyCode.AutoSize = true; this.chkBatchIdentifyCode.AutoSize = true;
this.chkBatchIdentifyCode.Checked = true; this.chkBatchIdentifyCode.Checked = true;
this.chkBatchIdentifyCode.CheckState = System.Windows.Forms.CheckState.Checked; this.chkBatchIdentifyCode.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkBatchIdentifyCode.Location = new System.Drawing.Point(903, 81); this.chkBatchIdentifyCode.Location = new System.Drawing.Point(903, 82);
this.chkBatchIdentifyCode.Name = "chkBatchIdentifyCode"; this.chkBatchIdentifyCode.Name = "chkBatchIdentifyCode";
this.chkBatchIdentifyCode.Size = new System.Drawing.Size(99, 21); this.chkBatchIdentifyCode.Size = new System.Drawing.Size(99, 21);
this.chkBatchIdentifyCode.TabIndex = 1111; this.chkBatchIdentifyCode.TabIndex = 1111;
@@ -871,7 +868,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkBatchStock.AutoSize = true; this.chkBatchStock.AutoSize = true;
this.chkBatchStock.Checked = true; this.chkBatchStock.Checked = true;
this.chkBatchStock.CheckState = System.Windows.Forms.CheckState.Checked; this.chkBatchStock.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkBatchStock.Location = new System.Drawing.Point(1188, 81); this.chkBatchStock.Location = new System.Drawing.Point(1188, 82);
this.chkBatchStock.Name = "chkBatchStock"; this.chkBatchStock.Name = "chkBatchStock";
this.chkBatchStock.Size = new System.Drawing.Size(87, 21); this.chkBatchStock.Size = new System.Drawing.Size(87, 21);
this.chkBatchStock.TabIndex = 1114; this.chkBatchStock.TabIndex = 1114;
@@ -894,7 +891,7 @@ namespace TemuKJD.KJDForms.ProductForms
// //
this.chkFilterJit.AutoSize = true; this.chkFilterJit.AutoSize = true;
this.chkFilterJit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.chkFilterJit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.chkFilterJit.Location = new System.Drawing.Point(1282, 47); this.chkFilterJit.Location = new System.Drawing.Point(1282, 45);
this.chkFilterJit.Name = "chkFilterJit"; this.chkFilterJit.Name = "chkFilterJit";
this.chkFilterJit.Size = new System.Drawing.Size(127, 21); this.chkFilterJit.Size = new System.Drawing.Size(127, 21);
this.chkFilterJit.TabIndex = 1231; this.chkFilterJit.TabIndex = 1231;
@@ -932,9 +929,6 @@ namespace TemuKJD.KJDForms.ProductForms
// //
this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading); this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
this.splitContainer2.Panel1.Controls.Add(this.chkSearchAllShop); this.splitContainer2.Panel1.Controls.Add(this.chkSearchAllShop);
this.splitContainer2.Panel1.Controls.Add(this.txtBatchExtCode);
this.splitContainer2.Panel1.Controls.Add(this.label1);
this.splitContainer2.Panel1.Controls.Add(this.btnCancelJit);
this.splitContainer2.Panel1.Controls.Add(this.dgvShop); this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
// //
@@ -971,67 +965,23 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkSearchAllShop.UseVisualStyleBackColor = true; this.chkSearchAllShop.UseVisualStyleBackColor = true;
this.chkSearchAllShop.Visible = false; this.chkSearchAllShop.Visible = false;
// //
// txtBatchExtCode
//
this.txtBatchExtCode.Location = new System.Drawing.Point(22, 88);
this.txtBatchExtCode.Multiline = true;
this.txtBatchExtCode.Name = "txtBatchExtCode";
this.txtBatchExtCode.Size = new System.Drawing.Size(156, 104);
this.txtBatchExtCode.TabIndex = 1043;
this.txtBatchExtCode.Visible = false;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(19, 68);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 1044;
this.label1.Text = "查询货号:";
this.label1.Visible = false;
//
// btnCancelJit
//
this.btnCancelJit.CanvasColor = System.Drawing.SystemColors.Control;
this.btnCancelJit.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnCancelJit.DisabledBackColor = System.Drawing.Color.Empty;
this.btnCancelJit.Location = new System.Drawing.Point(22, 198);
this.btnCancelJit.Name = "btnCancelJit";
this.btnCancelJit.Size = new System.Drawing.Size(106, 21);
this.btnCancelJit.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnCancelJit.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnCancelJit.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnCancelJit.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnCancelJit.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnCancelJit.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnCancelJit.Style.GradientAngle = 90;
this.btnCancelJit.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnCancelJit.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnCancelJit.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnCancelJit.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnCancelJit.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnCancelJit.TabIndex = 1144;
this.btnCancelJit.Text = "停止操作";
this.btnCancelJit.Visible = false;
this.btnCancelJit.Click += new System.EventHandler(this.btnCancelJit_Click);
//
// dgvShop // dgvShop
// //
this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false; this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; dataGridViewCellStyle14.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
this.dgvShop.AutoRowNumber = true; this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect, this.colSelect,
@@ -1191,19 +1141,19 @@ namespace TemuKJD.KJDForms.ProductForms
// //
this.dgvOpenJit.AllowUserToAddRows = false; this.dgvOpenJit.AllowUserToAddRows = false;
this.dgvOpenJit.AllowUserToDeleteRows = false; this.dgvOpenJit.AllowUserToDeleteRows = false;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249))))); dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5; this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16;
this.dgvOpenJit.AutoRowNumber = true; this.dgvOpenJit.AutoRowNumber = true;
this.dgvOpenJit.BackgroundColor = System.Drawing.Color.White; this.dgvOpenJit.BackgroundColor = System.Drawing.Color.White;
this.dgvOpenJit.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.dgvOpenJit.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control; dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText; dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvOpenJit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dgvOpenJit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
this.dgvOpenJit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvOpenJit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvOpenJit.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgvOpenJit.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck, this.colCheck,
@@ -1270,8 +1220,8 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// colSupplierName // colSupplierName
// //
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle7; this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle18;
this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.HeaderText = "店铺名称";
this.colSupplierName.Name = "colSupplierName"; this.colSupplierName.Name = "colSupplierName";
this.colSupplierName.ReadOnly = true; this.colSupplierName.ReadOnly = true;
@@ -1311,8 +1261,8 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// colProdName // colProdName
// //
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle8; this.colProdName.DefaultCellStyle = dataGridViewCellStyle19;
this.colProdName.HeaderText = "标题"; this.colProdName.HeaderText = "标题";
this.colProdName.Name = "colProdName"; this.colProdName.Name = "colProdName";
this.colProdName.ReadOnly = true; this.colProdName.ReadOnly = true;
@@ -1320,8 +1270,8 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// colSkuName // colSkuName
// //
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuName.DefaultCellStyle = dataGridViewCellStyle9; this.colSkuName.DefaultCellStyle = dataGridViewCellStyle20;
this.colSkuName.HeaderText = "规格名称"; this.colSkuName.HeaderText = "规格名称";
this.colSkuName.Name = "colSkuName"; this.colSkuName.Name = "colSkuName";
this.colSkuName.ReadOnly = true; this.colSkuName.ReadOnly = true;
@@ -1329,8 +1279,8 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// colExtCode // colExtCode
// //
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colExtCode.DefaultCellStyle = dataGridViewCellStyle10; this.colExtCode.DefaultCellStyle = dataGridViewCellStyle21;
this.colExtCode.HeaderText = "货号"; this.colExtCode.HeaderText = "货号";
this.colExtCode.Name = "colExtCode"; this.colExtCode.Name = "colExtCode";
this.colExtCode.ReadOnly = true; this.colExtCode.ReadOnly = true;
@@ -1353,8 +1303,8 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// colCreatTime // colCreatTime
// //
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle11; this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle22;
this.colCreatTime.HeaderText = "创建时间"; this.colCreatTime.HeaderText = "创建时间";
this.colCreatTime.Name = "colCreatTime"; this.colCreatTime.Name = "colCreatTime";
this.colCreatTime.ReadOnly = true; this.colCreatTime.ReadOnly = true;
@@ -1370,8 +1320,8 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// colCompliance // colCompliance
// //
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCompliance.DefaultCellStyle = dataGridViewCellStyle12; this.colCompliance.DefaultCellStyle = dataGridViewCellStyle23;
this.colCompliance.HeaderText = "合规信息"; this.colCompliance.HeaderText = "合规信息";
this.colCompliance.Name = "colCompliance"; this.colCompliance.Name = "colCompliance";
this.colCompliance.ReadOnly = true; this.colCompliance.ReadOnly = true;
@@ -1404,8 +1354,8 @@ namespace TemuKJD.KJDForms.ProductForms
// //
// colRecevieArea // colRecevieArea
// //
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle13; this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle24;
this.colRecevieArea.HeaderText = "期望到货"; this.colRecevieArea.HeaderText = "期望到货";
this.colRecevieArea.Name = "colRecevieArea"; this.colRecevieArea.Name = "colRecevieArea";
this.colRecevieArea.ReadOnly = true; this.colRecevieArea.ReadOnly = true;
@@ -1577,10 +1527,8 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.TextBox textBox1;
private DevComponents.DotNetBar.PanelEx btnClose; private DevComponents.DotNetBar.PanelEx btnClose;
private DevComponents.DotNetBar.PanelEx btnSearch1; private DevComponents.DotNetBar.PanelEx btnSearch1;
private System.Windows.Forms.TextBox txtBatchExtCode;
private System.Windows.Forms.TextBox txtBatchPriceMax; private System.Windows.Forms.TextBox txtBatchPriceMax;
private System.Windows.Forms.TextBox txtBatchPriceMin; private System.Windows.Forms.TextBox txtBatchPriceMin;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtBatchIdentifyCode; private System.Windows.Forms.TextBox txtBatchIdentifyCode;
private System.Windows.Forms.PictureBox pbBatchRealPicture; private System.Windows.Forms.PictureBox pbBatchRealPicture;
private DevComponents.DotNetBar.PanelEx btnBatchJit; private DevComponents.DotNetBar.PanelEx btnBatchJit;
@@ -1597,7 +1545,6 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private UserComponent.DataGridViewEx dgvExtCode; private UserComponent.DataGridViewEx dgvExtCode;
private DevComponents.DotNetBar.PanelEx btnSetReceiveArea; private DevComponents.DotNetBar.PanelEx btnSetReceiveArea;
private DevComponents.DotNetBar.PanelEx btnCancelJit;
private UserComponent.UcCheckBox chkFilterJit; private UserComponent.UcCheckBox chkFilterJit;
private DevComponents.DotNetBar.PanelEx btnCancel; private DevComponents.DotNetBar.PanelEx btnCancel;
private UserComponent.UcCheckBox chkFilterNotJit; private UserComponent.UcCheckBox chkFilterNotJit;
+26 -45
View File
@@ -454,7 +454,6 @@ namespace TemuKJD.KJDForms.ProductForms
column.Visible = true; column.Visible = true;
} }
lstFilterExtCode.Clear();
dgvExtCode.Rows.Clear(); dgvExtCode.Rows.Clear();
this.dgvOpenJit.Rows.Clear(); this.dgvOpenJit.Rows.Clear();
this.lstChainProdInfo.Clear(); this.lstChainProdInfo.Clear();
@@ -655,10 +654,8 @@ namespace TemuKJD.KJDForms.ProductForms
} }
} }
int num = 0;
foreach (var chainProdInfo in chainProductTmpLst) foreach (var chainProdInfo in chainProductTmpLst)
{ {
num++;
if (cancellationTokenSource.IsCancellationRequested) if (cancellationTokenSource.IsCancellationRequested)
break; break;
@@ -764,7 +761,7 @@ namespace TemuKJD.KJDForms.ProductForms
"" ""
); );
dgvOpenJit.Rows[rowId].Height = 60; dgvOpenJit.Rows[rowId].Height = 60;
if (num % 2 == 1) if (totalProdIndex % 2 == 1)
dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.White; dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.White;
else else
dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke; dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke;
@@ -792,13 +789,6 @@ namespace TemuKJD.KJDForms.ProductForms
var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>() var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>()
.Select(r => r.Cells["colExtCode"].Value.ParseToString()) .Select(r => r.Cells["colExtCode"].Value.ParseToString())
.Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList(); .Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
foreach (var ext in extCodeLst)
{
if (!this.txtBatchExtCode.Text.Split(new string[] { }, StringSplitOptions.RemoveEmptyEntries).Contains(ext))
{
this.txtBatchExtCode.Text += ext + "\r\n";
}
}
this.dgvExtCode.Rows.Clear(); this.dgvExtCode.Rows.Clear();
foreach (var ext in extCodeLst) foreach (var ext in extCodeLst)
@@ -1896,12 +1886,8 @@ Content-Disposition: form-data; name=""upload_sign""
cancellationTokenSource.Cancel(); cancellationTokenSource.Cancel();
} }
List<string> lstFilterExtCode = new List<string>();
private void ChkSelectExtCode_CheckedChanged(object sender, EventArgs e) private void ChkSelectExtCode_CheckedChanged(object sender, EventArgs e)
{ {
lstFilterExtCode = dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
FilterRows(); FilterRows();
} }
@@ -1918,9 +1904,6 @@ Content-Disposition: form-data; name=""upload_sign""
case "选": case "选":
case "货号": case "货号":
row.Cells["colSelectExtCode"].Value = !row.Cells["colSelectExtCode"].Value.ParseToBool(); row.Cells["colSelectExtCode"].Value = !row.Cells["colSelectExtCode"].Value.ParseToBool();
lstFilterExtCode = dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
FilterRows(); FilterRows();
break; break;
case "JIT配置": case "JIT配置":
@@ -1930,7 +1913,7 @@ Content-Disposition: form-data; name=""upload_sign""
var jitParam = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == extCode); var jitParam = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == extCode);
if (jitParam == null) if (jitParam == null)
{ {
BaseMsgForm.ShowError("配置已删除"); BaseMsgForm.ShowError("配置不存在");
} }
else else
{ {
@@ -1969,13 +1952,16 @@ Content-Disposition: form-data; name=""upload_sign""
void FilterRows() void FilterRows()
{ {
var filterExtCodeLst = dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
foreach (DataGridViewRow row in dgvOpenJit.Rows) foreach (DataGridViewRow row in dgvOpenJit.Rows)
{ {
row.Visible = true; row.Visible = true;
row.Cells["colCheck"].Value = false; row.Cells["colCheck"].Value = false;
if (lstFilterExtCode != null && lstFilterExtCode.Count > 0) if (filterExtCodeLst != null && filterExtCodeLst.Count > 0)
{ {
if (lstFilterExtCode.Contains(row.Cells["colExtCode"].Value.ParseToString())) if (filterExtCodeLst.Contains(row.Cells["colExtCode"].Value.ParseToString()))
{ {
row.Cells["colCheck"].Value = true; row.Cells["colCheck"].Value = true;
row.Visible = true; row.Visible = true;
@@ -2040,7 +2026,6 @@ Content-Disposition: form-data; name=""upload_sign""
column.Visible = false; column.Visible = false;
} }
lstFilterExtCode.Clear();
dgvExtCode.Rows.Clear(); dgvExtCode.Rows.Clear();
this.dgvOpenJit.Rows.Clear(); this.dgvOpenJit.Rows.Clear();
this.pbLoading.Visible = true; this.pbLoading.Visible = true;
@@ -2236,22 +2221,15 @@ Content-Disposition: form-data; name=""upload_sign""
BaseMsgForm.ShowInfo(sRst); BaseMsgForm.ShowInfo(sRst);
this.statusBar.lblTaskStatus.Text = sRst; this.statusBar.lblTaskStatus.Text = sRst;
var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>() //var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>()
.Select(r => r.Cells["colExtCode"].Value.ParseToString()) // .Select(r => r.Cells["colExtCode"].Value.ParseToString())
.Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList(); // .Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
foreach (var ext in extCodeLst)
{
if (!this.txtBatchExtCode.Text.Split(new string[] { }, StringSplitOptions.RemoveEmptyEntries).Contains(ext))
{
this.txtBatchExtCode.Text += ext + "\r\n";
}
}
this.dgvExtCode.Rows.Clear(); //this.dgvExtCode.Rows.Clear();
foreach (var ext in extCodeLst) //foreach (var ext in extCodeLst)
{ //{
this.dgvExtCode.Rows.Add(false, ext); // this.dgvExtCode.Rows.Add(false, ext);
} //}
})); }));
}, cancellationTokenSource.Token); }, cancellationTokenSource.Token);
} }
@@ -2325,15 +2303,18 @@ Content-Disposition: form-data; name=""upload_sign""
return; return;
} }
foreach (var extCode in extCodeLst) if (BaseMsgForm.ShowConfirm("确定要清除选中货号的JIT配置吗?", "提示").DialogResult == DialogResult.OK)
{ {
lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode); foreach (var extCode in extCodeLst)
} {
NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams); lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode);
BaseMsgForm.ShowInfo("选中货号的JIT配置已重置!"); }
foreach (var row in rows) NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams);
{ BaseMsgForm.ShowInfo("选中货号的JIT配置已清除!");
row.Cells["colJitConfig"].Value = "未设置"; foreach (var row in rows)
{
row.Cells["colJitConfig"].Value = "未设置";
}
} }
} }
} }
@@ -117,15 +117,6 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="colSelectExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colFilterExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colJitConfig.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@@ -213,4 +204,13 @@
<metadata name="colMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="colMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
<metadata name="colSelectExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colFilterExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colJitConfig.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root> </root>
@@ -1126,7 +1126,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
string originProductName = dbProd.product_name; string originProductName = dbProd.product_name;
string joinText = ","; string joinText = ",";
//如果有裂变词并且勾选了英文标题,则删除中文标题全部使用英文裂变词组成新的标题并写入英文标题 //如果有裂变词并且勾选了英文标题,则删除中文标题全部使用英文裂变词组成新的标题并写入英文标题
if (chkEnglishProdName.Checked && dbProd.fission_words.Length > 10 && CountChineseCharacters(dbProd.fission_words) < 10) if (chkEnglishProdName.Checked && dbProd.fission_words.Length > 10 && CountChineseCharacters(dbProd.fission_words) <= 0)
{ {
originProductName = ""; originProductName = "";
joinText = ", "; joinText = ", ";
@@ -2075,7 +2075,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//{ //{
//} //}
//英文标题 //翻译英文标题
if (chkEnglishProdName.Checked) if (chkEnglishProdName.Checked)
{ {
#region 调用百度翻译翻译英文标题 暂时作废 #region 调用百度翻译翻译英文标题 暂时作废
@@ -2120,20 +2120,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//} //}
#endregion #endregion
if (CountChineseCharacters(prodParam.productName) > 2) if (1 == 1)
{
Invoke(new Action(() =>
{
this.pnlError.Visible = true;
this.lblError.Text = "标题内含有中文,跳过英文标题设置";
}));
Task.Run(() =>
{
Thread.Sleep(5000);
this.pnlError.Visible = false;
});
}
else
{ {
prodParam.productI18nReqs = new List<productI18nParam>(); prodParam.productI18nReqs = new List<productI18nParam>();
productI18nParam productI18nEn = new productI18nParam productI18nParam productI18nEn = new productI18nParam
@@ -2141,7 +2128,25 @@ namespace TemuKJD.KJDForms.ProductSelectForms
language = "en", language = "en",
productName = prodParam.productName, productName = prodParam.productName,
}; };
prodParam.productI18nReqs.Add(productI18nEn); if (CountChineseCharacters(productI18nEn.productName) > 0)
{
productI18nEn.productName = productI18nEn.productName.Replace(headWords, "").Replace(endWords, "");
}
if (CountChineseCharacters(productI18nEn.productName) > 0)
{
Invoke(new Action(() =>
{
this.pnlError.Visible = true;
this.lblError.Text = "标题内含有中文,跳过英文标题设置";
}));
Task.Run(() =>
{
Thread.Sleep(5000);
this.pnlError.Visible = false;
});
}
else
prodParam.productI18nReqs.Add(productI18nEn);
} }
} }
@@ -872,53 +872,56 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
break; break;
} }
var change_cat_id = selectProd.change_cat_id.Split('>').LastOrDefault();
if (!string.IsNullOrEmpty(change_cat_id) && change_cat_id != catId.ParseToString())
catId = change_cat_id.ParseToLong();
var html = AddDraft(shop, catId.ToString()); var html = AddDraft(shop, catId.ToString());
if (html.Contains("不合法的类目") && catLevel > 1) //if (html.Contains("不合法的类目") && catLevel > 1)
{ //{
catId = catIdDic[catLevel - 1]; // catId = catIdDic[catLevel - 1];
//string catSearchStr = prodInfo.productName; // //string catSearchStr = prodInfo.productName;
//int index = catSearchStr.IndexOf("PCS "); // //int index = catSearchStr.IndexOf("PCS ");
//if (index > 0 && index < 5) // //if (index > 0 && index < 5)
// catSearchStr = catSearchStr.Substring(index + 4).Trim(); // // catSearchStr = catSearchStr.Substring(index + 4).Trim();
var changeCatName = selectProd.change_cat_name; // var changeCatName = selectProd.change_cat_name;
var changeCatId = selectProd.change_cat_id; // var changeCatId = selectProd.change_cat_id;
if (!string.IsNullOrWhiteSpace(changeCatName) && !string.IsNullOrWhiteSpace(changeCatId)) // if (!string.IsNullOrWhiteSpace(changeCatName) && !string.IsNullOrWhiteSpace(changeCatId))
{ // {
var changeCatNameList = selectProd.change_cat_name.Split('>').ToList(); // var changeCatNameList = selectProd.change_cat_name.Split('>').ToList();
var changeCatIdList = selectProd.change_cat_id.Split('>').ToList(); // var changeCatIdList = selectProd.change_cat_id.Split('>').ToList();
while (changeCatNameList.Count < 10) // while (changeCatNameList.Count < 10)
changeCatNameList.Add(""); // changeCatNameList.Add("");
while (changeCatIdList.Count < 10) // while (changeCatIdList.Count < 10)
changeCatIdList.Add("0"); // changeCatIdList.Add("0");
try // try
{ // {
prodParam.cat1Id = catIdDic[1] = changeCatIdList[0].ParseToLong(); // prodParam.cat1Id = catIdDic[1] = changeCatIdList[0].ParseToLong();
prodParam.cat2Id = catIdDic[2] = changeCatIdList[1].ParseToLong(); // prodParam.cat2Id = catIdDic[2] = changeCatIdList[1].ParseToLong();
prodParam.cat3Id = catIdDic[3] = changeCatIdList[2].ParseToLong(); // prodParam.cat3Id = catIdDic[3] = changeCatIdList[2].ParseToLong();
prodParam.cat4Id = catIdDic[4] = changeCatIdList[3].ParseToLong(); // prodParam.cat4Id = catIdDic[4] = changeCatIdList[3].ParseToLong();
prodParam.cat5Id = catIdDic[5] = changeCatIdList[4].ParseToLong(); // prodParam.cat5Id = catIdDic[5] = changeCatIdList[4].ParseToLong();
prodParam.cat6Id = catIdDic[6] = changeCatIdList[5].ParseToLong(); // prodParam.cat6Id = catIdDic[6] = changeCatIdList[5].ParseToLong();
prodParam.cat7Id = catIdDic[7] = changeCatIdList[6].ParseToLong(); // prodParam.cat7Id = catIdDic[7] = changeCatIdList[6].ParseToLong();
prodParam.cat8Id = catIdDic[8] = changeCatIdList[7].ParseToLong(); // prodParam.cat8Id = catIdDic[8] = changeCatIdList[7].ParseToLong();
prodParam.cat9Id = catIdDic[9] = changeCatIdList[8].ParseToLong(); // prodParam.cat9Id = catIdDic[9] = changeCatIdList[8].ParseToLong();
prodParam.cat10Id = catIdDic[10] = changeCatIdList[9].ParseToLong(); // prodParam.cat10Id = catIdDic[10] = changeCatIdList[9].ParseToLong();
for (int i = 10; i >= 1; i--) // for (int i = 10; i >= 1; i--)
{ // {
catLevel = i; // catLevel = i;
catId = catIdDic[catLevel]; // catId = catIdDic[catLevel];
if (catId > 0) // if (catId > 0)
break; // break;
} // }
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
catId = catIdDic[catLevel - 1]; // catId = catIdDic[catLevel - 1];
} // }
} // }
html = AddDraft(shop, catId.ToString()); // html = AddDraft(shop, catId.ToString());
} //}
if (html.Contains("\"success\":true")) if (html.Contains("\"success\":true"))
prodParam.productDraftId = BaseRegex.GetLongJson(ref html, "productDraftId"); prodParam.productDraftId = BaseRegex.GetLongJson(ref html, "productDraftId");
@@ -936,31 +939,31 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
if (dbProd.cat_id != catId.ParseToString()) if (dbProd.cat_id != catId.ParseToString())
{ {
//var catRst = GetCatPathList(shop, prodParam.productDraftId.ParseToString(), catId.ParseToString()); var catRst = GetCatPathList(shop, prodParam.productDraftId.ParseToString(), catId.ParseToString());
//if (catRst.Contains("\"success\":true")) if (catRst.Contains("\"success\":true"))
//{ {
// var regex = BaseRegex.GetMatchRegex(ref catRst, "\\\"catId\\\":\\d{1,10}"); var regex = BaseRegex.GetMatchRegex(ref catRst, "\\\"catId\\\":\\d{1,10}");
// if (regex.Count > 0) if (regex.Count > 0)
// { {
// var cats = regex.Cast<Match>().Select(m => m.Value.ParseToString().Replace("\"catId\":", "").ParseToLong()).ToList(); var cats = regex.Cast<Match>().Select(m => m.Value.ParseToString().Replace("\"catId\":", "").ParseToLong()).ToList();
// if (!cats.Any(c => c <= 0)) if (!cats.Any(c => c <= 0))
// { {
// while (cats.Count < 10) while (cats.Count < 10)
// cats.Add(0); cats.Add(0);
// prodParam.cat1Id = cats[0]; prodParam.cat1Id = cats[0];
// prodParam.cat2Id = cats[1]; prodParam.cat2Id = cats[1];
// prodParam.cat3Id = cats[2]; prodParam.cat3Id = cats[2];
// prodParam.cat4Id = cats[3]; prodParam.cat4Id = cats[3];
// prodParam.cat5Id = cats[4]; prodParam.cat5Id = cats[4];
// prodParam.cat6Id = cats[5]; prodParam.cat6Id = cats[5];
// prodParam.cat7Id = cats[6]; prodParam.cat7Id = cats[6];
// prodParam.cat8Id = cats[7]; prodParam.cat8Id = cats[7];
// prodParam.cat9Id = cats[8]; prodParam.cat9Id = cats[8];
// prodParam.cat10Id = cats[9]; prodParam.cat10Id = cats[9];
// } }
// } }
//} }
} }
prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList; prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
@@ -1625,6 +1628,14 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
return HttpResponseBLL.PostResponse2(shop, url, body, refere); return HttpResponseBLL.PostResponse2(shop, url, body, refere);
} }
private string GetCatPathList(ShopLoginInfo shop, string draftId, string catId)
{
string url = "https://agentseller.temu.com/anniston-agent-seller/category/path/list";
string refere = "https://agentseller.temu.com/goods/edit?productDraftId=" + draftId + "&from=productDraftList";
string body = @"{""catIds"":[" + catId + @"],""showCatEnName"":true}";
return HttpResponseBLL.PostResponse2(shop, url, body, refere);
}
private string CreateSizeSpec(ShopLoginInfo shop, string draftId, TemuSizeSpecParam sizeParam) private string CreateSizeSpec(ShopLoginInfo shop, string draftId, TemuSizeSpecParam sizeParam)
{ {
//string url = "https://seller.kuajingmaihuo.com/bg-anniston-mms/sizespec/createSizeSpec"; //string url = "https://seller.kuajingmaihuo.com/bg-anniston-mms/sizespec/createSizeSpec";