From fdebc0e6cb9c3ef1dbf33933cdc77e5b90032b5a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 29 十月 2024 16:51:52 +0800
Subject: [PATCH] 整体细微优化
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 3ffb5b5..7d516ed 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -4,6 +4,7 @@
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.Grid;
@@ -24,6 +25,10 @@
public Frm_MesInvItemArn()
{
InitializeComponent();
+ pageBar1.PagerEvent += PageBar1_PagerEvent;
+ this.gridView1.ColumnPanelRowHeight = 60;
+ this.gridView1.OptionsView.AllowHtmlDrawHeaders = true;
+ this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
@@ -35,7 +40,6 @@
toolBarMenu1.btnFjianYanClick += ToolBarMenu1_btnFjianYanClick;
gcMain.MouseDoubleClick += GcMain_MouseDoubleClick;
getPageList(1, UtilityHelper.GetPageSize());
- pageBar1.PagerEvent += PageBar1_PagerEvent;
gridView1.CustomDrawRowIndicator += (s, e) =>
{
if (e.Info.IsRowIndicator && e.RowHandle >= 0)
@@ -49,14 +53,17 @@
e.Bounds.Top + 45, e.Bounds.Right - 5, e.Bounds.Height - 5);
e.Graphics.DrawString(str, f, Brushes.Gray, r);
};
- txt_suppNo.EditChanged += (s, e) =>
- {
- var ddd = txt_suppNo.GetValue();
- // lbSupplierName.Text = ddd[1];
- };
+ 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,24 +73,20 @@
"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();
};
- txt_depotsCode.EditChanged += (s, e) =>
- {
- var ddd = txt_depotsCode.GetValue();
- //lbCkName.Text = ddd[1];
- };
}
-
- private void ToolBarMenu1_btnFjianYanClick1(object sender, EventArgs e)
- {
- throw new NotImplementedException();
- }
-
/// <summary>
/// 鍙嶆楠�
/// </summary>
@@ -264,8 +267,8 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- var _ckCode = txt_depotsCode.GetValue()[2]; //浠撳簱缂栧彿 depots_code
- var _gysCode = txt_suppNo.GetValue()[2]; //渚涘簲鍟嗙紪鍙�
+ var _ckCode = txt_depotsCode.GetCode(); //浠撳簱缂栧彿 depots_code
+ var _gysCode = txt_suppNo.GetCode(); //渚涘簲鍟嗙紪鍙�
if (string.IsNullOrEmpty(_ckCode))
{
MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
@@ -288,25 +291,33 @@
}
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.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)
+ {
+ MsgHelper.ShowError("鏄庣粏涓嶈兘涓虹┖锛岃閫夋嫨浣犵殑鏀舵枡鏄庣粏锛�");
+ return;
+ }
for (var i = 0; i < gvMx1.DataRowCount; i++)
{
var row = gvMx1.GetDataRow(i);
if (row != null)
{
- Guid? _guid = null;
- if (string.IsNullOrEmpty(row["guid"].ToString()))
- _guid = null;
- else
- _guid = Guid.Parse(row["guid"].ToString());
+ Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
+ string _msl = row["quantity"].ToString();
+ if (string.IsNullOrEmpty(_msl))
+ {
+ MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
+ return;
+ }
_obj.list.Add(new MesInvItemArnDetail
{
Guid = _guid,
--
Gitblit v1.9.3