From ccf94b9eca1dce73f6af0908327fca3c2cc4484c Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 11 八月 2025 17:49:20 +0800
Subject: [PATCH] 1、合并修改红章标识
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 2 +-
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 10 +++++++---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 26 +++++++++++++-------------
3 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 86a855c..96b517f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -153,9 +153,9 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_sourceDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_demandDocumentId = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gv_releaseNo = new DevExpress.XtraGrid.Columns.GridColumn();
gv_remainingReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
@@ -1478,18 +1478,6 @@
this.gv_demandDocumentId.VisibleIndex = 14;
this.gv_demandDocumentId.Width = 23;
//
- // picCheckBox
- //
- this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
- this.picCheckBox.Location = new System.Drawing.Point(808, 43);
- this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.picCheckBox.Name = "picCheckBox";
- this.picCheckBox.Size = new System.Drawing.Size(88, 39);
- this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
- this.picCheckBox.TabIndex = 6;
- this.picCheckBox.TabStop = false;
- this.picCheckBox.Visible = false;
- //
// gv_releaseNo
//
this.gv_releaseNo.Caption = "妫�楠屽崟鍙�";
@@ -1498,6 +1486,18 @@
this.gv_releaseNo.Visible = true;
this.gv_releaseNo.VisibleIndex = 30;
//
+ // picCheckBox
+ //
+ this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+ this.picCheckBox.Location = new System.Drawing.Point(863, 23);
+ this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.picCheckBox.Name = "picCheckBox";
+ this.picCheckBox.Size = new System.Drawing.Size(88, 39);
+ this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+ this.picCheckBox.TabIndex = 6;
+ this.picCheckBox.TabStop = false;
+ this.picCheckBox.Visible = false;
+ //
// Frm_MesInvItemArn
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 3f20f85..e855057 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -609,22 +609,26 @@
_webServiceName + _meth,
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnData.outMsg);
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnData.outMsg);
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
}
int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
gridView1.FocusedRowHandle = rowHandle;
- int _inFieldValue = (_meth == "EditModelSubmit" ? 1 : -1);
+ //鍒ゆ柇瀹℃牳鍚庢槸鍚﹀彉涓虹孩绔狅紙1锛氱孩绔犲凡瀹℃牳 锛�-1 榛戠珷鏈鏍革級
+ int _inFieldValue = ((_meth == "EditModelSubmit"|| _meth== "EditModelSubmitHb") ? 1 : -1);
UtilityHelper.SetCheckIco(gridView1, "fstatus", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnData.outMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 2ce17b3..9b4a6ad 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -533,7 +533,7 @@
private void BtnHb_ItemClick(object sender, ItemClickEventArgs e)
{
- //鐐瑰嚮鎸夐挳鏃跺皢鏈鏍告牱寮忔敼涓哄鏍告牱寮�
+
bool bl = _isCk(1);
if (bl) return;
if (btnHbClick != null)
--
Gitblit v1.9.3