From cbb5315301b1490b57497212256c5255e5eb7eb6 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 01 十一月 2025 17:06:58 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
index 48daa38..516e938 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesDbck.cs
@@ -32,6 +32,7 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
toolBarMenu1.btnShouHouChkClick += ToolBarMenu1_btnShouHouChkClick;
toolBarMenu1.btnShouHouFchkClick += ToolBarMenu1_btnShouHouFchkClick;
+ toolBarMenu1.btnWjClick += ToolBarMenu1_btnWjClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "chkStatus", "", (value) =>
@@ -123,6 +124,7 @@
//榛樿浠撳簱鍜屼粨搴撴暟閲�
_row["dcCk"] = dym.depotName;
_row["dcCkGuid"] = dym.depotId;
+ _row["kcQty"] = dym.kcQty;
if (!string.IsNullOrEmpty(_orgId))
{
_row["dcOrg"] = _orgName;
@@ -157,7 +159,44 @@
}
};
#endregion
+
+ #region 2025-10-10 鍚戜笅澶嶅埗beg
+ btnDown.Click += (s, e) =>
+ {
+ // 鑾峰彇褰撳墠閫変腑琛岀殑琛屽彿
+ int focusedRowHandle = gvMx1.FocusedRowHandle;
+ if (focusedRowHandle < 0) return;
+
+ // 鑾峰彇褰撳墠琛岀殑鏃堕暱
+ DataRow currentRow = gvMx1.GetDataRow(focusedRowHandle);
+ if (currentRow == null) return;
+ var hourValue = currentRow["drCkGuid"];
+ var hourValue2 = currentRow["drCk"];
+ if (hourValue == null || string.IsNullOrEmpty(hourValue.ToString())) {
+ MsgHelper.ShowError("褰撳墠閫変腑鐨勮鏃犱粨搴擄紝澶嶅埗澶辫触锛�");
+ return;
+ }
+ if (hourValue2 == null) {
+ MsgHelper.ShowError("褰撳墠閫変腑鐨勮鏃犱粨搴擄紝澶嶅埗澶辫触锛�");
+ return;
+ }
+ // 鎵归噺璁剧疆涓嬮潰鎵�鏈夎鐨勬椂闀�
+ for (int i = focusedRowHandle + 1; i < gvMx1.DataRowCount; i++)
+ {
+ var row = gvMx1.GetDataRow(i);
+ if (row != null)
+ {
+ row["drCkGuid"] = hourValue;
+ row["drCk"] = hourValue2;
+ }
+ }
+ gvMx1.RefreshData();
+ };
+ #endregion
}
+
+
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
_filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -585,7 +624,16 @@
}
}
-
+ /// <summary>
+ /// 瀹岀粨
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnWjClick(object sender, EventArgs e)
+ {
+ _toolCk(2);
+ }
/// <summary>
/// 瀹℃牳浜嬩欢
/// </summary>
@@ -642,6 +690,9 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
+ case 2:
+ strMsg = "瀹岀粨";
+ break;
case 20:
strMsg = "鍞悗瀹℃牳";
break;
@@ -679,8 +730,8 @@
getModel(lbGuid.Text.Trim());
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- if (_inFieldValue <= 1)
- UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
+ if (_inFieldValue <= 1)
+ UtilityHelper.SetCheckIco(gridView1, "chkStatus", "FAPPROVEBY", "FAPPROVEDATE", picCheckBox, this, _inFieldValue.ToString());
}
else
{
@@ -714,10 +765,9 @@
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.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
@@ -762,7 +812,7 @@
getModel(lbGuid.Text);
}
else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
--
Gitblit v1.9.3