From 378fe54c249973cbdf7e6f2c1a31c576e3efd0a6 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 28 七月 2025 18:02:57 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 144 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 102 insertions(+), 42 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 5c02edc..7995916 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,5 +1,6 @@
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Sys;
+using Gs.DevApp.DevFrm.WOM;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -24,7 +25,7 @@
this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
this.toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
- // this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
+ this.toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
this.toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
@@ -35,11 +36,16 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
+ this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx4);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx6);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx7);
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx8);
+ txt_daa015.getSuppler("");
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -280,7 +286,26 @@
_filterList = e.FilterList;
getPageList(1);
}
-
+ /// <summary>
+ /// 宸ュ簭鍙樻洿
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnGxClick(object sender, EventArgs e)
+ {
+ toolBarMenu1.guidKey = "";
+ string rowGuid, rowName;
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
+ lbGuid, txt_daa001, gridView1, "daa001");
+ if (string.IsNullOrEmpty(rowGuid))
+ {
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ return;
+ }
+ var frm = new ShowGx(rowGuid);
+ frm.ShowDialog();
+ }
/// <summary>
/// 鍒犻櫎宸ュ崟
/// </summary>
@@ -452,7 +477,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -463,8 +488,8 @@
else
{
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- gvList.Add(gvMx1);
- gvList.Add(gvMx2);
+ //gvList.Add(gvMx1);
+ //gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
}
@@ -476,36 +501,39 @@
/// <param name="e"></param>
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
- //toolBarMenu1.isSetBtn = false;
- //var _obj = new
- //{
- // guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
- // sjxt = txt_sjXt.GetId(), //瀹為檯绾夸綋
- // bz = txt_daa009.Text.Trim()//澶囨敞
- //};
- //try
- //{
- // string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
- // ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
- // if (_rtn.rtnCode > 0)
- // {
- // lbGuid.Text = _rtn.rtnData;
- // toolBarMenu1.isSetBtn = true;
- // List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
- // gvList.Add(gvMx1);
- // UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
- // toolBarMenu1.currentAction = "";
- // txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
- // txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
- // toolBarMenu1.currentAction = "";
- // Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
- // }
- //}
- //catch (Exception ex)
- //{
- // ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
- //}
+ toolBarMenu1.isSetBtn = false;
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ sjxt = txt_daa015.GetId(), //绾夸綋
+ sclx = txt_daa025.Text.Trim(),//鐢熶骇绫诲瀷
+ bz = txt_daa009.Text.Trim()//澶囨敞
+ };
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ lbGuid.Text = _rtn.rtnData;
+ toolBarMenu1.isSetBtn = true;
+ List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
+ //gvList.Add(gvMx1);
+ UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ //toolBarMenu1.currentAction = "";
+ //txt_printRemark.Enabled = txt_psnQty_1.Enabled = txt_iCount_1.Enabled = true;
+ //txt_printRemark.ReadOnly = txt_psnQty_1.ReadOnly = txt_iCount_1.ReadOnly = false;
+ //toolBarMenu1.currentAction = "";
+ Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ }
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
}
/// <summary>
@@ -557,12 +585,12 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (string.IsNullOrEmpty(strGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -576,9 +604,6 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- //string cjId = dy.daa013;
- //string xjxt = dy.sjXt;
- // txt_sjXt.getSuppler(cjId, xjxt);
//鎵樻澘鐮�
txt_zQty.Text = dy.daa008;
txt_yQty.Text = dy.yQty;
@@ -696,7 +721,7 @@
}
}
- //2025-7-20鍔犱笂浜х嚎纭
+ //2025-7-20鍔犱笂浜х嚎纭璁板綍
JArray array6 = new JArray();
foreach (var a in _job["rtnData"]["list6"])
{
@@ -715,7 +740,42 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx6, gvMx6);
}
-
+ JArray array7 = new JArray();
+ foreach (var a in _job["rtnData"]["list7"])
+ {
+ array7.Add(a);
+ }
+ DataTable dt7 = JsonConvert.DeserializeObject<DataTable>(array7.ToString());
+ if (dt7.Rows.Count > 0)
+ {
+ gcMx7.BindingContext = new BindingContext();
+ gcMx7.DataSource = dt7;
+ gcMx7.ForceInitialize();
+ gvMx7.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx7);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx7, gvMx7);
+ }
+ JArray array8 = new JArray();
+ foreach (var a in _job["rtnData"]["list8"])
+ {
+ array8.Add(a);
+ }
+ DataTable dt8 = JsonConvert.DeserializeObject<DataTable>(array8.ToString());
+ if (dt8.Rows.Count > 0)
+ {
+ gcMx8.BindingContext = new BindingContext();
+ gcMx8.DataSource = dt8;
+ gcMx8.ForceInitialize();
+ gvMx8.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx8);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx8, gvMx8);
+ }
txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
}
else
--
Gitblit v1.9.3