From b7ad7b35a094d5f9fcf4a884d876e05b4a226c98 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 13 六月 2025 14:15:49 +0800
Subject: [PATCH] 批准
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
index 7544877..98e34cf 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -241,6 +241,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>
/// 淇濆瓨浜嬩欢
@@ -266,6 +267,7 @@
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("鐢熸晥鏃ユ湡涓嶈兘涓虹┖锛�");
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("鐢熸晥鏃ユ湡涓嶈兘澶т簬澶辨晥鏃ユ湡锛�");
@@ -292,6 +294,12 @@
{
Gs.DevApp.ToolBox.MsgHelper.ShowInformation("璇疯緭鍏ユ纭殑閲嶉噺涓嬮檺锛�");
txt_fMinWeight.Focus(); return;
+ }
+ //涓婇檺涓嶈兘浣庝簬涓嬮檺
+ if (decimal.Parse(txt_fMaxWeight.Text.Trim()) < decimal.Parse(txt_fMinWeight.Text.Trim()))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowInformation("涓婇檺涓嶈兘浣庝簬涓嬮檺锛�");
+ txt_fMaxWeight.Focus(); return;
}
var _obj = new
{
@@ -364,6 +372,11 @@
getModel(rowGuid);
}
+
+ /// <summary>
+ /// 璇诲彇瀹炰綋
+ /// </summary>
+ /// <param name="strGuid"></param>
private void getModel(string strGuid)
{
bool isEdit = false;
@@ -391,6 +404,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"])
--
Gitblit v1.9.3