From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
index 014e341..4a55b0b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -42,6 +42,18 @@
//鍏跺畠鍑哄簱鍗曚粨绠″憳
sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
sb.Append(" values(newid(),'" + lb_qtckdcgy.Text.Trim() + "','" + txt_qtckdcgy.Text.Trim() + "','" + layoutControlItem6.Text.Trim() + "')");
+ //閲囪喘閫�璐х敵璇烽噰璐憳
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_cgthsqcgy.Text.Trim() + "','" + txt_cgthsqcgy.Text.Trim() + "','" + layoutControlItem12.Text.Trim() + "')");
+ //鐢熶骇閫�鏂欒秴%鍒欒璁″垝瀹℃牳锛屽嵆鎵瑰噯
+ sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
+ sb.Append(" values(newid(),'" + lb_sctlbfb.Text.Trim() + "','" + txt_sctlbfb.Text.Trim() + "','" + layoutControlItem14.Text.Trim() + "')");
+ //閿�鍞憳
+ 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() + "')");
var _obj = new
{
sql = sb.ToString(),
@@ -112,6 +124,21 @@
txt_qtckdcgy.Text = row["parameterValue"].ToString();
continue;
}
+ if (row["remark"].ToString() == layoutControlItem12.Text)
+ {
+ 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;
+ }
}
}
else
--
Gitblit v1.9.3