1库存上传可以修改类目, 2修复选品上传标题内有中文导致无法上传问题 3商品核价过滤优化
This commit is contained in:
1 parent
55d4a27d90
commit
a23020725a
10 files changed
+945
-606
No files matched your search
@@ -454,7 +454,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
column.Visible = true;
|
||||
}
|
||||
|
||||
lstFilterExtCode.Clear();
|
||||
dgvExtCode.Rows.Clear();
|
||||
this.dgvOpenJit.Rows.Clear();
|
||||
this.lstChainProdInfo.Clear();
|
||||
@@ -655,10 +654,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
}
|
||||
}
|
||||
|
||||
int num = 0;
|
||||
foreach (var chainProdInfo in chainProductTmpLst)
|
||||
{
|
||||
num++;
|
||||
if (cancellationTokenSource.IsCancellationRequested)
|
||||
break;
|
||||
|
||||
@@ -764,7 +761,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
""
|
||||
);
|
||||
dgvOpenJit.Rows[rowId].Height = 60;
|
||||
if (num % 2 == 1)
|
||||
if (totalProdIndex % 2 == 1)
|
||||
dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.White;
|
||||
else
|
||||
dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke;
|
||||
@@ -792,13 +789,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>()
|
||||
.Select(r => r.Cells["colExtCode"].Value.ParseToString())
|
||||
.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();
|
||||
foreach (var ext in extCodeLst)
|
||||
@@ -1896,12 +1886,8 @@ Content-Disposition: form-data; name=""upload_sign""
|
||||
cancellationTokenSource.Cancel();
|
||||
}
|
||||
|
||||
List<string> lstFilterExtCode = new List<string>();
|
||||
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();
|
||||
}
|
||||
|
||||
@@ -1918,9 +1904,6 @@ Content-Disposition: form-data; name=""upload_sign""
|
||||
case "选":
|
||||
case "货号":
|
||||
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();
|
||||
break;
|
||||
case "JIT配置":
|
||||
@@ -1930,7 +1913,7 @@ Content-Disposition: form-data; name=""upload_sign""
|
||||
var jitParam = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == extCode);
|
||||
if (jitParam == null)
|
||||
{
|
||||
BaseMsgForm.ShowError("配置已删除");
|
||||
BaseMsgForm.ShowError("配置不存在");
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1969,13 +1952,16 @@ Content-Disposition: form-data; name=""upload_sign""
|
||||
|
||||
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)
|
||||
{
|
||||
row.Visible = true;
|
||||
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.Visible = true;
|
||||
@@ -2040,7 +2026,6 @@ Content-Disposition: form-data; name=""upload_sign""
|
||||
column.Visible = false;
|
||||
}
|
||||
|
||||
lstFilterExtCode.Clear();
|
||||
dgvExtCode.Rows.Clear();
|
||||
this.dgvOpenJit.Rows.Clear();
|
||||
this.pbLoading.Visible = true;
|
||||
@@ -2236,22 +2221,15 @@ Content-Disposition: form-data; name=""upload_sign""
|
||||
BaseMsgForm.ShowInfo(sRst);
|
||||
this.statusBar.lblTaskStatus.Text = sRst;
|
||||
|
||||
var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>()
|
||||
.Select(r => r.Cells["colExtCode"].Value.ParseToString())
|
||||
.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";
|
||||
}
|
||||
}
|
||||
//var extCodeLst = this.dgvOpenJit.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)
|
||||
{
|
||||
this.dgvExtCode.Rows.Add(false, ext);
|
||||
}
|
||||
//this.dgvExtCode.Rows.Clear();
|
||||
//foreach (var ext in extCodeLst)
|
||||
//{
|
||||
// this.dgvExtCode.Rows.Add(false, ext);
|
||||
//}
|
||||
}));
|
||||
}, cancellationTokenSource.Token);
|
||||
}
|
||||
@@ -2325,15 +2303,18 @@ Content-Disposition: form-data; name=""upload_sign""
|
||||
return;
|
||||
}
|
||||
|
||||
foreach (var extCode in extCodeLst)
|
||||
if (BaseMsgForm.ShowConfirm("确定要清除选中货号的JIT配置吗?", "提示").DialogResult == DialogResult.OK)
|
||||
{
|
||||
lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode);
|
||||
}
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams);
|
||||
BaseMsgForm.ShowInfo("选中货号的JIT配置已重置!");
|
||||
foreach (var row in rows)
|
||||
{
|
||||
row.Cells["colJitConfig"].Value = "未设置";
|
||||
foreach (var extCode in extCodeLst)
|
||||
{
|
||||
lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode);
|
||||
}
|
||||
NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams);
|
||||
BaseMsgForm.ShowInfo("选中货号的JIT配置已清除!");
|
||||
foreach (var row in rows)
|
||||
{
|
||||
row.Cells["colJitConfig"].Value = "未设置";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user