From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 459dfc5..48daa38 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -120,6 +120,9 @@
_row["itemId"] = dym.itemId;
_row["shNum"] = dym.sl;
_row["remark"] = dym.bz;
+ //榛樿浠撳簱鍜屼粨搴撴暟閲�
+ _row["dcCk"] = dym.depotName;
+ _row["dcCkGuid"] = dym.depotId;
if (!string.IsNullOrEmpty(_orgId))
{
_row["dcOrg"] = _orgName;
@@ -711,9 +714,14 @@
gvMx1.SetFocusedRowCellValue("itemModel", SelectedDataRow["itemModel"].ToString());
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"].ToString());
gvMx1.SetFocusedRowCellValue("itemUnit", SelectedDataRow["dwName"].ToString());
+
+ gvMx1.SetFocusedRowCellValue("dcCk", SelectedDataRow["depotName"]);
+ gvMx1.SetFocusedRowCellValue("dcCkGuid", SelectedDataRow["depotId"]);
+
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
}
/// <summary>
@@ -796,19 +804,21 @@
return;
var dr = gvMx1.GetDataRow(rowhandle);
var strOrgGuid = dr["dcOrgGuid"].ToString();
+ var strItemId = dr["itemId"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨嚭缁勭粐锛�");
return;
}
;
- SelectCk frm = new SelectCk(strOrgGuid);
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("dcCk", lst[0].name);
gvMx1.SetFocusedRowCellValue("dcCkGuid", lst[0].guid);
+ gvMx1.BestFitColumns();
};
frm.ShowDialog();
}
@@ -879,19 +889,21 @@
return;
var dr = gvMx1.GetDataRow(rowhandle);
var strOrgGuid = dr["drOrgGuid"].ToString();
+ var strItemId = dr["itemId"].ToString();
if (string.IsNullOrEmpty(strOrgGuid))
{
MsgHelper.ShowError("鎻愮ず锛氳鍏堥�夋嫨璋冨叆缁勭粐锛�");
return;
}
;
- SelectCk frm = new SelectCk(strOrgGuid);
+ SelectCk frm = new SelectCk(strOrgGuid, strItemId);
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<dynamic>();
lst = ee.DynamicList;
gvMx1.SetFocusedRowCellValue("drCk", lst[0].name);
gvMx1.SetFocusedRowCellValue("drCkGuid", lst[0].guid);
+ gvMx1.BestFitColumns();
};
frm.ShowDialog();
}
--
Gitblit v1.9.3