From daebf2c2a4f1cbbf310e9d739c2ed198cfc5865e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 22 七月 2025 08:26:53 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 90 +++++++++++++++++++++++++++++++-------------
1 files changed, 63 insertions(+), 27 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index 34b2b3e..92bdf28 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -1,4 +1,4 @@
-锘�
+锘縰sing Gs.DevApp.DevFrm.QC;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -76,12 +76,28 @@
}
catch (Exception ex)
{
- MessageBox.Show(ex.Message);
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
}
};
frm.ShowDialog();
};
_getListJyxm();
+ //澶嶅埗
+ btnCopy.Click += (s, e) =>
+ {
+ if ((lbGuid.Text.Trim().Length < 10))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛淇濆瓨褰撳墠淇℃伅锛�");
+ return;
+ }
+ if ((txt_isCheck.Checked == false))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇ラ」鐩湭瀹℃牳锛屾殏涓嶈兘澶嶅埗鍒板叾瀹冪墿鏂欙紒");
+ return;
+ }
+ Frm_WorkTechniqueShow frm = new Frm_WorkTechniqueShow(lbGuid.Text.Trim());
+ frm.ShowDialog();
+ };
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -156,7 +172,7 @@
private void getPageList(int curPage)
{
gcMain1.DataSource = null;
- var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+ gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "org.FNumber asc ,a.item_no asc", "",
"", _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
@@ -190,7 +206,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -224,6 +240,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gvList);
+ this.btnCopy.Enabled = true;
}
/// <summary>
/// 淇濆瓨浜嬩欢
@@ -233,48 +250,55 @@
private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
{
toolBarMenu1.isSetBtn = false;
- if (txt_fType.SelectedIndex <= 0)
+ if (txt_fType.SelectedIndex <0)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("鐢熶骇绫诲瀷涓嶈兘涓虹┖锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熶骇绫诲瀷涓嶈兘涓虹┖锛�");
txt_fType.Focus();
return;
}
if (txt_fJingDu.SelectedIndex < 0)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("绠＄悊绮惧害涓嶈兘涓虹┖锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("绠＄悊绮惧害涓嶈兘涓虹┖锛�");
txt_fJingDu.Focus(); return;
}
if (txt_fBegDate.Text.Length <= 0)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("鐢熸晥鏃ユ湡涓嶈兘涓虹┖锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熸晥鏃ユ湡涓嶈兘涓虹┖锛�");
txt_fBegDate.Focus(); return;
}
+ txt_fEndDate.DateTime= new DateTime(2099, 1, 1);
if (txt_fEndDate.Text.Length > 0 && txt_fBegDate.DateTime > txt_fEndDate.DateTime)
{
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("鐢熸晥鏃ユ湡涓嶈兘澶т簬澶辨晥鏃ユ湡锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢熸晥鏃ユ湡涓嶈兘澶т簬澶辨晥鏃ユ湡锛�");
txt_fEndDate.Focus(); return;
}
decimal num = 0;
int num2 = 0;
if (!int.TryParse(txt_fSumPeople.Text.Trim(), out num2))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇疯緭鍏ユ纭殑瀹氬憳锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑瀹氬憳锛�");
txt_fSumPeople.Focus(); return;
}
if (!decimal.TryParse(txt_fCapacity.Text.Trim(), out num))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇疯緭鍏ユ纭殑浜ц兘锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑浜ц兘锛�");
txt_fCapacity.Focus(); return;
}
if (!decimal.TryParse(txt_fMaxWeight.Text.Trim(), out num))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇疯緭鍏ユ纭殑閲嶉噺涓婇檺锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑閲嶉噺涓婇檺锛�");
txt_fMaxWeight.Focus(); return;
}
if (!decimal.TryParse(txt_fMinWeight.Text.Trim(), out num))
{
- Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇疯緭鍏ユ纭殑閲嶉噺涓嬮檺锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇疯緭鍏ユ纭殑閲嶉噺涓嬮檺锛�");
txt_fMinWeight.Focus(); return;
+ }
+ //涓婇檺涓嶈兘浣庝簬涓嬮檺
+ if (decimal.Parse(txt_fMaxWeight.Text.Trim()) < decimal.Parse(txt_fMinWeight.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("涓婇檺涓嶈兘浣庝簬涓嬮檺锛�");
+ txt_fMaxWeight.Focus(); return;
}
var _obj = new
{
@@ -313,20 +337,22 @@
{
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)
{
+ ToolBox.MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
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 = "";
- Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
+ //Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
}
+ else
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -341,12 +367,17 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
getModel(rowGuid);
}
+
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -354,7 +385,7 @@
if (toolBarMenu1.currentAction == "edit") isEdit = true;
if (string.IsNullOrEmpty(strGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
var _obj = new
@@ -374,6 +405,7 @@
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gvMx1);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
+ this.btnCopy.Enabled = true;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
foreach (var a in _job["rtnData"]["list"])
@@ -396,12 +428,12 @@
}
else
{
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -427,7 +459,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -443,15 +475,17 @@
_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());
getModel(lbGuid.Text.Trim());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -489,13 +523,15 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -520,7 +556,7 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
--
Gitblit v1.9.3