From 1c05af558e5756a29e4891e0d431814d33875339 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 13:05:50 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
index 365f536..55cbb39 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemArn.cs
@@ -2,8 +2,10 @@
using System.Collections.Generic;
using System.Data;
using System.Drawing;
+using System.Security.Cryptography;
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 +26,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 +41,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)
@@ -63,8 +68,15 @@
"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();
@@ -280,25 +292,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