From b2ae2d8e16c6f8daeb5853d3f31d6895f1bf8a3a Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 30 十一月 2024 15:45:28 +0800
Subject: [PATCH] 1
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
index c1f707c..df00bdf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesInvItemOuts.cs
@@ -175,7 +175,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -223,7 +223,7 @@
private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- // (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1);
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -303,7 +303,7 @@
_obj.MesInvItemOutItemsList.Add(new MesInvItemOutItems
{
Guid = _guid,
- AboutGuid = row["aboutGuid"].ToString(),//
+ AboutGuid = UtilityHelper.ToGuid(row["aboutGuid"].ToString()),//
Quantity = decimal.Parse(row["quantity"].ToString())
});
}
@@ -391,10 +391,11 @@
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
+ gvList.Add(gvMx2);
UtilityHelper.SetValueByObj(this.panel1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
+ foreach (var a in _job["rtnData"]["mesInvItemOutCDetailsList"])
{
array.Add(a);
}
@@ -409,6 +410,23 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+
+ JArray array1 = new JArray();
+ foreach (var a in _job["rtnData"]["mesInvItemOutItemsList"])
+ {
+ array1.Add(a);
+ }
+ DataTable dt1 = JsonConvert.DeserializeObject<DataTable>(array1.ToString());
+ if (dt1.Rows.Count > 0)
+ {
+ gcMx2.BindingContext = new BindingContext();
+ gcMx2.DataSource = dt1;
+ gcMx2.ForceInitialize();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ }
}
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
@@ -421,20 +439,20 @@
private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
{
- gvMx1.CloseEditor();
- gvMx1.UpdateCurrentRow();
- var rowhandle = gvMx1.FocusedRowHandle;
+ gvMx2.CloseEditor();
+ gvMx2.UpdateCurrentRow();
+ var rowhandle = gvMx2.FocusedRowHandle;
if (rowhandle < 0)
return;
if (e.Button.Index == 0)
{
- var dr = gvMx1.GetDataRow(rowhandle);
+ var dr = gvMx2.GetDataRow(rowhandle);
var mxGuid = dr["guid"].ToString();
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
return;
if (string.IsNullOrEmpty(mxGuid))
{
- gvMx1.DeleteRow(rowhandle);
+ gvMx2.DeleteRow(rowhandle);
return;
}
var strJson = "";
@@ -443,7 +461,7 @@
try
{
strJson = UtilityHelper.HttpPost("",
- _webServiceName + "DeleteModelMx",
+ _webServiceName + "DeleteModelMx2",
JsonConvert.SerializeObject(lst));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0) getModel(lbGuid.Text, true, 1);
--
Gitblit v1.9.3