From ca48402cd224ea7f830a809dc604a1a580c8205a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 23 九月 2025 14:03:45 +0800
Subject: [PATCH] 工单计划变更
---
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 391 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 274 insertions(+), 117 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 493843b..70d162c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -1,5 +1,7 @@
+using DevExpress.Utils;
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;
@@ -8,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Drawing;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -20,11 +23,13 @@
public Frm_Womdaa()
{
InitializeComponent();
+ //鍏堥殣钘�4绉嶆墦鍗�
+ // txt_mesStartProd.CustomFormat = "yyyy-MM-dd HH:mm";
this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
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 +40,18 @@
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
+ this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
this.toolBarMenu1.getXmlConfig();
+ gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
+ gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
+ Gs.DevApp.ToolBox.UtilityHelper.CustomProgressBarColumn(gvMx1, "barbl", 90, Brushes.OrangeRed, Brushes.DodgerBlue);
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);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -73,32 +85,37 @@
lbGuid, txt_daa001, gridView1);
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鎵樻澘鐮�");
string strCodeList = "";
+ string strAction = "";
frm.UpdateParent += (ss, ee) =>
{
strCodeList = ee.StringSingle;
+ strAction = ee.Data;
};
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- try
+ if (strAction == "print")
{
- string rptParameter = "rpt_daa{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ try
{
- rpt.ShowDialog();
+ string rptParameter = "rpt_daa{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
}
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
};
//杩欐槸杩芥函鐮�
@@ -113,32 +130,37 @@
lbGuid, txt_daa001, gridView1);
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "杩芥函鐮�");
string strCodeList = "";
+ string strAction = "";
frm.UpdateParent += (ss, ee) =>
{
strCodeList = ee.StringSingle;
+ strAction = ee.Data;
};
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- try
+ if (strAction == "print")
{
- string rptParameter = "rpt_trace{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ try
{
- rpt.ShowDialog();
+ string rptParameter = "rpt_trace{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
}
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
};
//杩欐槸鍚庣洊鐮�
@@ -153,32 +175,38 @@
lbGuid, txt_daa001, gridView1);
SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "鍚庣洊鐮�");
string strCodeList = "";
+ string strAction = "";
frm.UpdateParent += (ss, ee) =>
{
strCodeList = ee.StringSingle;
+ strAction = ee.Data;
};
frm.ShowDialog();
if (string.IsNullOrEmpty(strCodeList))
return;
- try
+ if (strAction.StartsWith("print"))
{
- string rptParameter = "rpt_hgm{"
- + "100"
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + ""
- + "," + strCodeList
- + "}";
- using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ string printParm = strAction.Replace("print", "");
+ try
{
- rpt.ShowDialog();
+ string rptParameter = printParm + "{"
+ + "100"
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + ""
+ + "," + strCodeList
+ + "}";
+ using (Form rpt = new RptPreview(rowGuid, rptParameter))
+ {
+ rpt.ShowDialog();
+ }
+ frm.Close();
}
- frm.Close();
- }
- catch (Exception ex)
- {
- MsgHelper.ShowError(ex.Message);
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError(ex.Message);
+ }
}
};
//杩欐槸榻愬鏍囪瘑鍗★紝浠呬粎鎵撳嵃
@@ -207,15 +235,19 @@
"XlsInOut/" + strService,
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ if (_rtn.rtnCode > 0)
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
frm.ShowDialog();
};
+ //缁存姢瀹㈡埛妯＄増
this.btnDesign.Click += (s, e) =>
{
EasyRptEdtShow frm = new EasyRptEdtShow();
@@ -266,7 +298,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>
@@ -279,7 +330,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_daa001, gridView1, "daa001");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -297,17 +348,19 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
/// <summary>
@@ -323,7 +376,7 @@
lbGuid, txt_daa001, gridView1, "daa001");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾閲嶆柊鐢熸垚棣栨鍚楋紵"))
@@ -339,25 +392,16 @@
_webServiceName + "EditModelSubmitShouJian",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
- //if (xtraTabControl1.SelectedTabPageIndex == 1)
- //{
- // getModel(lbGuid.Text.Trim());
- //}
- //else
- //{
- // //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
- // getPageList(this.pageBar1.CurrentPage);
- // int rowHandle = gridView1.LocateByValue("guid", rowGuid);
- // gridView1.FocusedRowHandle = rowHandle;
- //}
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -445,7 +489,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);
@@ -456,8 +500,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);
}
}
@@ -469,36 +513,66 @@
/// <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;
+ DateTime _dtKg = txt_mesStartProd.DateTime;
+ DateTime _dtWg = txt_mesEndProd.DateTime;
+ if (string.IsNullOrEmpty(txt_mesStartProd.Text.Trim()))
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氶璁″紑宸ユ椂闂翠笉鑳戒负绌猴紒");
+ txt_mesStartProd.Focus();
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_mesEndProd.Text.Trim()))
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氶璁″畬宸ユ椂闂翠笉鑳戒负绌猴紒");
+ txt_mesEndProd.Focus();
+ return;
+ }
+ if (_dtWg < _dtKg)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氬畬宸ユ椂闂翠笉鑳藉皬浜庡紑宸ユ椂闂达紒");
+ return;
+ }
+ if (string.IsNullOrEmpty(txt_daa015.GetId()))
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛氱嚎浣撲笉鑳戒负绌猴紒");
+ return;
+ }
+ var _obj = new
+ {
+ guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //涓诲缓
+ sjxt = txt_daa015.GetId(), //绾夸綋
+ sclx = txt_daa025.Text.Trim(),//鐢熶骇绫诲瀷
+ bz = txt_daa009.Text.Trim(),//澶囨敞
+ dtKg = _dtKg.ToString("yyyy-MM-dd HH:mm:ss"),
+ dtWg = _dtWg.ToString("yyyy-MM-dd HH:mm:ss"),
+ };
+ 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);
+ //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);
+ toolBarMenu1.currentAction = "";
+ }
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
}
/// <summary>
@@ -508,7 +582,11 @@
/// <param name="pageSize">姣忛〉鍑犳潯</param>
private void getPageList(int curPage)
{
- gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null;
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ERP_SCZZ in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "desc", "", _sbSqlWhere.ToString());
string json = JsonConvert.SerializeObject(pgq);
try
@@ -550,12 +628,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
@@ -569,9 +647,8 @@
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
- //string cjId = dy.daa013;
- //string xjxt = dy.sjXt;
- // txt_sjXt.getSuppler(cjId, xjxt);
+ string lineId = dy.daa013;
+ txt_daa015.getSuppler(txt_daa013.Text.Trim(), lineId);
//鎵樻澘鐮�
txt_zQty.Text = dy.daa008;
txt_yQty.Text = dy.yQty;
@@ -584,7 +661,6 @@
txt_zQty100.Text = dy.daa008;
txt_yQty100.Text = dy.yQty100;
txt_kQty100.Text = dy.kQty100;
-
lbGuid.Text = strGuid;
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
@@ -688,15 +764,72 @@
continue;
}
}
-
+ //2025-7-20鍔犱笂浜х嚎纭璁板綍
+ JArray array6 = new JArray();
+ foreach (var a in _job["rtnData"]["list6"])
+ {
+ array6.Add(a);
+ }
+ DataTable dt6 = JsonConvert.DeserializeObject<DataTable>(array6.ToString());
+ if (dt6.Rows.Count > 0)
+ {
+ gcMx6.BindingContext = new BindingContext();
+ gcMx6.DataSource = dt6;
+ gcMx6.ForceInitialize();
+ gvMx6.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx6);
+ }
+ else
+ {
+ 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 = "";
+ txt_iCount_98.Text = txt_kQty98.Text;//杩芥函鐮�
+ txt_iCount_100.Text = txt_kQty100.Text;//鍚庣洊鐮�
+
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -736,14 +869,15 @@
case 9:
strMsg = "鎵嬪姩瀹屽伐";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
lbGuid, txt_daa001, gridView1, "daa001");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -760,9 +894,10 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -775,10 +910,12 @@
gridView1.FocusedRowHandle = rowHandle;
}
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -908,7 +1045,27 @@
+ "," + ""
+ "}";
}
-
#endregion
+
+ /// <summary>
+ /// 鍙樻洿鍐呭寘瑁呮暟閲�
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void rptTuoBanNbz_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+ {
+ var rowhandle = gvMx2.FocusedRowHandle;
+ if (rowhandle < 0)
+ return;
+ if (e.Button.Index == 0)
+ {
+ var dr = gvMx2.GetDataRow(rowhandle);
+ var mxGuid = dr["guid"].ToString();
+ if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍙樻洿鍐呭寘瑁呮暟閲忓悧锛�"))
+ return;
+ var frm = new Frm_WomdaaNbz(mxGuid);
+ frm.ShowDialog();
+ }
+ }
}
}
\ No newline at end of file
--
Gitblit v1.9.3