From 913ed7a10dbd50d3e74ef014a9a0d497dde09049 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期二, 30 十一月 2021 17:41:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BLL/Xt_UserController.cs | 8 +++-----
WebAPI/Models/Gy_User.cs | 1 +
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BLL/Xt_UserController.cs b/WebAPI/Controllers/BLL/Xt_UserController.cs
index 9cff91f..6f248cd 100644
--- a/WebAPI/Controllers/BLL/Xt_UserController.cs
+++ b/WebAPI/Controllers/BLL/Xt_UserController.cs
@@ -162,24 +162,22 @@
msg2 = msg2.Replace("\n", ""); //\n
lsmain = oListModels.getObjectByJson_Gy_Gy_User(msg2);
- oCN.BeginTran();
//淇濆瓨
if (msg3=="Add") //鏂板
{
- oCN.RunProc("insert into Gy_Czygl (Czybm,Czymc,Czmm,Explain) values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString()+"')");
+ oCN.RunProc("insert into Gy_Czygl (Czybm,Czymc,Czmm,Explain,HEmpID) values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "')");
}
else //淇敼
{
if (lsmain[0].Czyyz != "" && lsmain[0].Czmm == lsmain[0].Czyyz) //淇敼瀵嗙爜
{
- oCN.RunProc("update Gy_Czygl set Czymc='"+lsmain[0].Czymc.ToString()+ "',Czmm='"+ ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "',Explain='"+lsmain[0].Explain.ToString()+ "' where Czybm='"+lsmain[0].Czybm.ToString()+"'");
+ oCN.RunProc("update Gy_Czygl set Czymc='"+lsmain[0].Czymc.ToString()+ "',Czmm='"+ ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "',Explain='" + lsmain[0].Explain.ToString() + "' ,HEmpID='" + lsmain[0].HEmpID.ToString() + "' where Czybm='" + lsmain[0].Czybm.ToString()+"'");
}
else
{
- oCN.RunProc("update Gy_Czygl set Czymc='" + lsmain[0].Czymc.ToString() + "',Explain='" + lsmain[0].Explain.ToString() + "' where Czybm='" + lsmain[0].Czybm.ToString() + "'");
+ oCN.RunProc("update Gy_Czygl set Czymc='" + lsmain[0].Czymc.ToString() + "',Explain='" + lsmain[0].Explain.ToString() + "',HEmpID='" + lsmain[0].HEmpID.ToString() + "' where Czybm='" + lsmain[0].Czybm.ToString() + "'");
}
}
- oCN.Commit();
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Models/Gy_User.cs b/WebAPI/Models/Gy_User.cs
index 193ddff..9b1d83d 100644
--- a/WebAPI/Models/Gy_User.cs
+++ b/WebAPI/Models/Gy_User.cs
@@ -12,5 +12,6 @@
public string Czmm { get; set; }
public string Czyyz { get; set; }
public string Explain { get; set; }
+ public string HEmpID { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.1