From 1708934e25d663104182867b4c238a0c1531352f Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期五, 28 十一月 2025 13:44:10 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs | 54 +++++++++++++++++++-----------------------------------
1 files changed, 19 insertions(+), 35 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
index db0a890..cc74d89 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
@@ -1,7 +1,4 @@
-锘縰sing DevExpress.ClipboardSource.SpreadsheetML;
-using DevExpress.XtraEditors;
-using DevExpress.XtraEditors.Repository;
-using DevExpress.XtraPrinting.Native;
+锘縰sing DevExpress.XtraEditors;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
@@ -9,16 +6,12 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
-using System.ComponentModel;
using System.Configuration;
using System.Data;
using System.Drawing;
-using System.Linq;
using System.Net;
-using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
-using System.Windows.Media.Animation;
namespace Gs.DevApp.DevFrm.FQC
{
@@ -30,7 +23,6 @@
public Frm_FQCItem()
{
InitializeComponent();
-
// 缁戝畾浜嬩欢
gridView2.CellValueChanged += gridView2_CellValueChanged;
gridView3.CellValueChanged += gridView3_CellValueChanged;
@@ -46,9 +38,7 @@
txt_SampleSize2.Leave += txt_SampleSize2_Leave;
// 娣诲姞鎶芥牱鏂规硶涓嬫媺妗嗕簨浠�
this.txt_SampleMethod.SelectedIndexChanged += Txt_SampleMethod_SelectedIndexChanged;
-
- //this.toolBarMenu1.getXmlConfig();
-
+ this.toolBarMenu1.getXmlConfig();
// 璁剧疆GridView鍙傛暟
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView3);
@@ -86,10 +76,8 @@
{
// 閫夋嫨鍖�閫熸椂锛氬惎鐢ㄥ寑閫熸娊鏍锋暟锛岀鐢ㄩ殢鏈烘娊鏍锋暟
txt_SampleSize1.Properties.ReadOnly = false;
- txt_SampleSize1.Properties.Appearance.BackColor = Color.White;
-
+
txt_SampleSize2.Properties.ReadOnly = true;
- txt_SampleSize2.Properties.Appearance.BackColor = Color.WhiteSmoke;
txt_SampleSize2.Text = ""; // 娓呯┖闅忔満鎶芥牱鏁�
if (int.TryParse(txt_SampleSize1.Text.Trim(), out int size))
@@ -99,10 +87,8 @@
{
// 閫夋嫨闅忔満鏃讹細鍚敤闅忔満鎶芥牱鏁帮紝绂佺敤鍖�閫熸娊鏍锋暟
txt_SampleSize2.Properties.ReadOnly = false;
- txt_SampleSize2.Properties.Appearance.BackColor = Color.White;
-
+
txt_SampleSize1.Properties.ReadOnly = true;
- txt_SampleSize1.Properties.Appearance.BackColor = Color.WhiteSmoke;
txt_SampleSize1.Text = ""; // 娓呯┖鍖�閫熸娊鏍锋暟
if (int.TryParse(txt_SampleSize2.Text.Trim(), out int size))
@@ -112,11 +98,9 @@
{
// 鏈�夋嫨鎴栧叾浠栨儏鍐碉細涓や釜杈撳叆妗嗛兘绂佺敤
txt_SampleSize1.Properties.ReadOnly = true;
- txt_SampleSize1.Properties.Appearance.BackColor = Color.WhiteSmoke;
txt_SampleSize1.Text = "";
-
+
txt_SampleSize2.Properties.ReadOnly = true;
- txt_SampleSize2.Properties.Appearance.BackColor = Color.WhiteSmoke;
txt_SampleSize2.Text = "";
}
@@ -170,31 +154,25 @@
{
// 鏍规嵁褰撳墠鎶芥牱鏂规硶鍊艰缃緭鍏ユ鐘舵��
string currentSampleMethod = txt_SampleMethod.Text.Trim();
-
+
if (currentSampleMethod == "鍖�閫�")
{
txt_SampleSize1.Properties.ReadOnly = false;
- txt_SampleSize1.Properties.Appearance.BackColor = Color.White;
-
+
txt_SampleSize2.Properties.ReadOnly = true;
- txt_SampleSize2.Properties.Appearance.BackColor = Color.LightGray;
}
else if (currentSampleMethod == "闅忔満")
{
txt_SampleSize2.Properties.ReadOnly = false;
- txt_SampleSize2.Properties.Appearance.BackColor = Color.White;
-
+
txt_SampleSize1.Properties.ReadOnly = true;
- txt_SampleSize1.Properties.Appearance.BackColor = Color.LightGray;
}
else
{
// 鏈�夋嫨鏃朵袱涓兘绂佺敤
txt_SampleSize1.Properties.ReadOnly = true;
- txt_SampleSize1.Properties.Appearance.BackColor = Color.LightGray;
-
+
txt_SampleSize2.Properties.ReadOnly = true;
- txt_SampleSize2.Properties.Appearance.BackColor = Color.LightGray;
}
}
@@ -324,7 +302,7 @@
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMain1, gridView1);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl1, gridView2);
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl2, gridView3);
-
+
// 鍒濆鍖栨娊鏍锋暟杈撳叆妗嗙姸鎬�
InitializeSampleSizeControls();
}
@@ -336,11 +314,12 @@
lbGuid, txt_Guid, gridView1);
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
getModel(rowGuid);
+
}
/// <summary>
@@ -413,7 +392,12 @@
RPB014 = row["RPB014"]?.ToString(),
RPB015 = row["RPB015"]?.ToString(),
RPB016 = row["RPB016"]?.ToString(),
+ RPB017 = row["RPB017"]?.ToString(),
+ RPB018 = row["RPB018"]?.ToString(),
+ RPB019 = row["RPB019"]?.ToString(),
+ RPB020 = row["RPB020"]?.ToString(),
Remark = row["Remark"]?.ToString(),
+ Seq = row["Seq"]?.ToString(),
});
}
}
@@ -544,7 +528,7 @@
dynamic dy = _rtn.rtnData;
lbGuid.Text = strGuid;
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit);
-
+
// 鎺у埗鏄庣粏琛ㄥ彲缂栬緫鐘舵��
List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
gvList.Add(gridView2); // 椤圭洰鏍囧噯瀛愯〃
@@ -552,7 +536,7 @@
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
-
+
// 澶勭悊椤圭洰鏍囧噯瀛愯〃鏁版嵁
JArray array1 = new JArray();
if (_job["rtnData"]["list"] != null)
--
Gitblit v1.9.3