From 69323cd646d8a8b10d8dc4998ba7aa4113e6b10c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期四, 13 十一月 2025 15:52:34 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
index a10a4d1..36e5494 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -51,6 +51,22 @@
//閿�鍞憳
sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
sb.Append(" values(newid(),'" + lb_FSalesManId.Text.Trim() + "','" + txt_FSalesManId.Text.Trim() + "','" + layoutControlItem16.Text.Trim() + "')");
+ //榻愬鍏ュ簱
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_qtRk.Text.Trim() + "','" + txt_qtRk.Text.Trim() + "','" + layoutControlItem18.Text.Trim() + "')");
+ //棰滆壊
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_colorFinish.Text.Trim() + "','" + txt_colorFinish.Text.Trim() + "','" + layoutControlItem20.Text.Trim() + "')");
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_colorIng.Text.Trim() + "','" + txt_colorIng.Text.Trim() + "','" + layoutControlItem21.Text.Trim() + "')");
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_color.Text.Trim() + "','" + txt_color.Text.Trim() + "','" + layoutControlItem22.Text.Trim() + "')");
+ //鍏堣繘鍏堝嚭
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" +lb_OutsXjxc.Text.Trim() + "','" + txt_OutsXjxc.Text.Trim() + "','" + layoutControlItem26.Text.Trim() + "')");
+ //閫�鏂欑鎺у師鏂欎粨鏄惁鏈夋枡(1:寮�鍚� 锛�0锛氬叧闂�)
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_tlrk.Text.Trim() + "','" + txt_tlrk.Text.Trim() + "','" + layoutControlItem28.Text.Trim() + "')");
var _obj = new
{
sql = sb.ToString(),
@@ -126,12 +142,42 @@
txt_cgthsqcgy.Text = row["parameterValue"].ToString();
continue;
}
-
if (row["remark"].ToString() == layoutControlItem14.Text)
{
txt_sctlbfb.Text = row["parameterValue"].ToString();
continue;
}
+ if (row["remark"].ToString() == layoutControlItem18.Text)
+ {
+ txt_qtRk.Text = row["parameterValue"].ToString();
+ continue;
+ }
+
+ if (row["remark"].ToString() == layoutControlItem20.Text)
+ {
+ txt_colorFinish.Text = row["parameterValue"].ToString();
+ continue;
+ }
+ if (row["remark"].ToString() == layoutControlItem21.Text)
+ {
+ txt_colorIng.Text = row["parameterValue"].ToString();
+ continue;
+ }
+ if (row["remark"].ToString() == layoutControlItem22.Text)
+ {
+ txt_color.Text = row["parameterValue"].ToString();
+ continue;
+ }
+ if (row["remark"].ToString() == layoutControlItem26.Text)
+ {
+ txt_OutsXjxc.Text = row["parameterValue"].ToString();
+ continue;
+ }
+ if (row["remark"].ToString() == layoutControlItem28.Text)
+ {
+ txt_tlrk.Text = row["parameterValue"].ToString();
+ continue;
+ }
}
}
else
--
Gitblit v1.9.3