修复bug,优化店铺筛选选项

This commit is contained in:
wule committed 2026-05-18 10:10:57 +08:00
1 parent aa45b35145
commit ad325eaec5
15 files changed
+596 -347

No files matched your search

@@ -70,10 +70,10 @@ namespace TemuKJD.WXForms.TalkForms
if (order == null)
return;
var row = dgvPddBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOOtherOrderSn").ParseToString() == order.order_sn);
var row = dgvBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOOtherOrderSn").ParseToString() == order.order_sn);
if (row == null)
{
var rowIndex = this.dgvPddBuyerOrder.Rows.Add(
var rowIndex = this.dgvBuyerOrder.Rows.Add(
false,
order.buyerId,
order.buyerName,
@@ -87,10 +87,11 @@ namespace TemuKJD.WXForms.TalkForms
order.outExpressCompanyName,
order.tracking_number,
order.sendStatus,
"编辑",
"发送",
"退货"
);
row = dgvPddBuyerOrder.Rows[rowIndex];
row = dgvBuyerOrder.Rows[rowIndex];
row.Height = 40;
}
@@ -170,7 +171,7 @@ namespace TemuKJD.WXForms.TalkForms
order.order_time = BaseClass.DateTimeToTimestampSeconds(DateTime.Now);
order.order_status_prompt = "";
if (order.buyerName.IsNullOrEmpty() || order.order_amount == 0 || order.order_sn.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
if (order.buyerName.IsNullOrEmpty() || order.order_amount == 0 || order.order_sn.IsNullOrEmpty() /*|| order.tracking_number.IsNullOrEmpty()*/)
{
BaseMsgForm.ShowError("请完整填写拍单信息");
return;
@@ -181,8 +182,11 @@ namespace TemuKJD.WXForms.TalkForms
lstOtherBuyerOrderInfoLite.Add(order);
else
{
if (BaseMsgForm.ShowConfirm("已存在该买手订单,是否覆盖并重复发送?").DialogResult != DialogResult.OK)
return;
if (!orderExist.tracking_number.IsNullOrEmpty() || order.tracking_number.IsNullOrEmpty())
{
if (BaseMsgForm.ShowConfirm("已存在买手订单,是否覆盖并重复发送?").DialogResult != DialogResult.OK)
return;
}
orderExist.order_amount = order.order_amount;
orderExist.buyerName = order.buyerName;
orderExist.outExpressCompanyMsg = order.outExpressCompanyMsg;
@@ -216,7 +220,7 @@ namespace TemuKJD.WXForms.TalkForms
return;
if (resetSendStatus)
order.sendStatus = "";
var row = dgvPddBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOPddOrderSn").ParseToString() == order.order_sn);
var row = dgvBuyerOrder.Rows.Cast<DataGridViewRow>().FirstOrDefault(p => p.Cells.GetCellValueFromColumnName("colOPddOrderSn").ParseToString() == order.order_sn);
Invoke(new Action(() =>
{
if (row != null)
@@ -329,23 +333,26 @@ namespace TemuKJD.WXForms.TalkForms
{
if (e.ColumnIndex < 0 || e.RowIndex < 0)
return;
string headerText = dgvPddBuyerOrder.Columns[e.ColumnIndex].HeaderText;
var orderSn = dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colOOtherOrderSn"].Value.ParseToString();
string headerText = dgvBuyerOrder.Columns[e.ColumnIndex].HeaderText;
var orderSn = dgvBuyerOrder.Rows[e.RowIndex].Cells["colOOtherOrderSn"].Value.ParseToString();
var order = lstOtherBuyerOrderInfoLite.FirstOrDefault(p => p.order_sn == orderSn);
var row = dgvBuyerOrder.Rows[e.RowIndex];
switch (headerText)
{
case "详情":
case "编辑/详情":
case "编辑":
cmbBuyerName.Text = row.Cells["colOBuyerName"].Value.ParseToString();
txtOrderAmount.Text = row.Cells["colOOrderAmount"].Value.ParseToString();
txtBuyerOrderSn.Text = row.Cells["colOOtherOrderSn"].Value.ParseToString();
txtExpressSn.Text = row.Cells["colOExpressId"].Value.ParseToString();
break;
case "图片":
ShowImgForm imgFrom = new ShowImgForm(dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", ""));
ShowImgForm imgFrom = new ShowImgForm(dgvBuyerOrder.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", ""));
imgFrom.ShowDialog();
break;
case "":
case "全选":
dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvPddBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value;
dgvBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvBuyerOrder.Rows[e.RowIndex].Cells["colCheck"].Value;
break;
case "发送":
if (tempWaitOrderLst.Any(o => o.order_sn == order.order_sn))
@@ -368,5 +375,42 @@ namespace TemuKJD.WXForms.TalkForms
break;
}
}
private void btnClear_Click(object sender, EventArgs e)
{
cmbBuyerName.Text = "";
txtBuyerOrderSn.Text = "";
txtExpressSn.Text = "";
txtOrderAmount.Text = "";
}
private void btnFilterOrder_Click(object sender, EventArgs e)
{
foreach(DataGridViewRow row in dgvBuyerOrder.Rows)
{
if (row.Cells["colOBuyerName"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
{
row.Visible = true;
continue;
}
if (row.Cells["colOOtherOrderSn"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
{
row.Visible = true;
continue;
}
if (row.Cells["colOExpressId"].Value.ParseToString().Contains(txtFilter.Text.Trim()))
{
row.Visible = true;
continue;
}
row.Visible = false;
}
}
private void btnRestore_Click(object sender, EventArgs e)
{
txtFilter.Text = "";
btnFilterOrder_Click(null, null);
}
}
}