From c2248f08e9bdc75cac6a329bf37234c7af17f16c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 01 十一月 2024 15:20:47 +0800
Subject: [PATCH] 小细节
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index c09832d..d10b626 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -4,8 +4,10 @@
using System.Drawing;
using System.Text;
using System.Windows.Forms;
+using DevExpress.DataAccess.DataFederation;
using DevExpress.XtraEditors;
using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraGrid.Views.Base.ViewInfo;
using DevExpress.XtraGrid.Views.Grid;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -37,6 +39,7 @@
toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
+ toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
gridView1.CustomDrawRowIndicator += (s, e) =>
@@ -54,9 +57,15 @@
};
this.txt_depotsCode.KeyFile = "depotCode";
this.txt_suppNo.KeyFile = "suppNo";
+ //閫夋嫨闇�瑕佸叆搴撶殑鏄庣粏
btnSelect.Click += (s, e) =>
{
- var frm = new SelectCgMx();
+ if (string.IsNullOrEmpty(this.txt_suppNo.GetId()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨渚涘簲鍟嗭紝鎵嶈兘閫夋嫨鏉ユ枡鏄庣粏锛�");
+ return;
+ }
+ var frm = new SelectCgMx(this.txt_suppNo.GetCode());
frm.UpdateParent += (ss, ee) =>
{
var lst = new List<string>();
@@ -66,17 +75,28 @@
"MesInvItemArnDetailManager/GetListPageByCgmxGuid",
JsonConvert.SerializeObject(_obj));
var dt = UtilityHelper.ReturnToList(strReturn);
+ DataTable _newTable = dt.rtnData;
+ DataTable _oldTable = (DataTable)gcMx1.DataSource;
+ DataRow[] sourceRows = _newTable.Select();
+ for (int i = 0; i < sourceRows.Length; i++)
+ {
+ _oldTable.ImportRow(sourceRows[i]);
+ }
gcMx1.BindingContext = new BindingContext();
- gcMx1.DataSource = dt.rtnData;
+ gcMx1.DataSource = _oldTable;
gcMx1.ForceInitialize();
};
frm.ShowDialog();
};
}
- private void ToolBarMenu1_btnFjianYanClick1(object sender, EventArgs e)
+ private void ToolBarMenu1_btnLogClick(object sender, EventArgs e)
{
- throw new NotImplementedException();
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_billNo, gridView1);
+ toolBarMenu1.guidKey = rowGuid;
}
/// <summary>
@@ -261,13 +281,6 @@
toolBarMenu1.isSetBtn = false;
var _ckCode = txt_depotsCode.GetCode(); //浠撳簱缂栧彿 depots_code
var _gysCode = txt_suppNo.GetCode(); //渚涘簲鍟嗙紪鍙�
- if (string.IsNullOrEmpty(_ckCode))
- {
- MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
- txt_depotsCode.Focus();
- return;
- }
-
if (string.IsNullOrEmpty(_gysCode))
{
MsgHelper.Warning("璇烽�夋嫨渚涘簲鍟嗭紒");
@@ -275,24 +288,25 @@
return;
}
- if (string.IsNullOrEmpty(txt_paperBillNo.Text.Trim()))
+ if (string.IsNullOrEmpty(_ckCode))
{
- MsgHelper.Warning("璇烽�夋嫨閫佽揣鍗曞彿锛�");
- txt_paperBillNo.Focus();
+ MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ txt_depotsCode.Focus();
return;
}
-
var _obj = new MesInvItemArn();
- _obj.Guid = null; //鍒拌揣鍗曚富閿�
+ _obj.Guid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(lbGuid.Text.Trim()); //鍒拌揣鍗曚富閿�
_obj.PaperBillNo = txt_paperBillNo.Text.Trim(); //閫佽揣鍗曞彿;
- _obj.Remark = ""; //澶囨敞
+ _obj.Remark = txt_remark.Text.Trim(); //澶囨敞
_obj.SuppNo = _gysCode; //渚涘簲鍟嗙紪鍙�
_obj.DepotsCode = _ckCode; //浠撳簱缂栧彿 depots_code
- _obj.FType = 1; //0=閲囪喘锛�1=濮斿
+ _obj.FType = txt_fType.Checked; //0=閲囪喘锛�1=濮斿
+ _obj.UrgentFlag = txt_urgentFlag.Checked;//0=涓嶆�ワ紝1=鎬�
_obj.list = new List<MesInvItemArnDetail>();
gvMx1.CloseEditor();
gvMx1.UpdateCurrentRow();
- if (gvMx1.DataRowCount <= 0) {
+ if (gvMx1.DataRowCount <= 0)
+ {
MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
return;
}
--
Gitblit v1.9.3