From 07524287033977cdb0cf45c66f2c3b5d8cc44fb7 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 30 十月 2025 08:41:49 +0800
Subject: [PATCH] 委外加上完结
---
DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index 6d87553..2556e59 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.Linq;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.QC
@@ -57,6 +58,7 @@
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.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
{
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -202,6 +204,7 @@
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
+ gridViews.Add(gvMx3);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gridViews);
}
}
@@ -217,9 +220,11 @@
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
+ gridViews.Add(gvMx3);
UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
txt_createDate.Text = DateTime.Now.ToString("G");
txt_fversion.Text = "1";
}
@@ -250,6 +255,9 @@
gvMx2.CloseEditor();
gvMx2.PostEditor();
gvMx2.UpdateCurrentRow();
+ gvMx3.CloseEditor();
+ gvMx3.PostEditor();
+ gvMx3.UpdateCurrentRow();
try
{
var qmaql2 = new List<MesQmAql2>();
@@ -325,6 +333,27 @@
});
}
}
+ var qmaql4 = new List<MesQmAql4>();
+ for (var i = 0; i < gvMx3.DataRowCount; i++)
+ {
+ var row = gvMx3.GetDataRow(i);
+ if (row != null)
+ {
+ if (string.IsNullOrEmpty(row["aqlType"].ToString()))
+ {
+ MsgHelper.ShowError("鎷掓敹璐ㄩ噺姘村钩涓嶈兘涓虹┖锛�");
+ return;
+ }
+ qmaql4.Add(new MesQmAql4
+ {
+ Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
+ AqlType = Convert.ToDecimal(row["AqlType"].ToString()),
+ AqlTypeCr = row["AqlTypeCr"].ToString(),
+ AqlTypeMa = row["AqlTypeMa"].ToString(),
+ AqlTypeMi = row["AqlTypeMi"].ToString(),
+ });
+ }
+ }
if (qmaql2.Count <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
@@ -333,6 +362,11 @@
if (qmaql3.Count <= 0)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
+ return;
+ }
+ if (qmaql4.Count <= 0)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("AQL鎶芥牱鍩哄噯涓嶈兘涓虹┖锛�");
return;
}
var _obj = new MesQmAql1
@@ -347,7 +381,8 @@
FoneChecked = false,
Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
MesQmAql2s = qmaql2,
- MesQmAql3s = qmaql3
+ MesQmAql3s = qmaql3,
+ MesQmAql4s = qmaql4
};
try
{
@@ -362,6 +397,7 @@
List<GridView> gridViews = new List<GridView>();
gridViews.Add(gvMx1);
gridViews.Add(gvMx2);
+ gridViews.Add(gvMx3);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
toolBarMenu1.currentAction = "";
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
@@ -452,10 +488,12 @@
List<GridView> gvList = new List<GridView>();
gvList.Add(gvMx1);
gvList.Add(gvMx2);
+ gvList.Add(gvMx3);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
JArray mesQmAql3s = new JArray();
+ JArray mesQmAql4s = new JArray();
foreach (var a in _job["rtnData"]["mesQmAql2s"])
{
array.Add(a);
@@ -486,7 +524,24 @@
}
else
{
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
+ }
+
+ foreach (var a in _job["rtnData"]["mesQmAql4s"])
+ {
+ mesQmAql4s.Add(a);
+ }
+ DataTable dt2 = JsonConvert.DeserializeObject<DataTable>(mesQmAql4s.ToString());
+ if (dt2.Rows.Count > 0)
+ {
+ gcMx3.BindingContext = new BindingContext();
+ gcMx3.DataSource = dt2;
+ gcMx3.ForceInitialize();
+ // gvMx3.BestFitColumns();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
}
}
else
--
Gitblit v1.9.3