From 338a7ef46eddc9f2f0f8f40d17a37a9ef4a844bb Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 31 十二月 2021 01:08:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/WebAPIController.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index bce9931..df1ca51 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -133,6 +133,38 @@
}
}
+
+ /// <summary>
+ /// 鑾峰彇鐧诲綍椤电粍缁囧垪
+ /// </summary>
+ /// <returns></returns>
+ [Route("GetOrganizations")]
+ [HttpGet]
+ public object GetOrganizations()
+ {
+ try
+ {
+ ClsCN oCn = new ClsCN();
+ DataSet oDs = new DataSet();
+ //==========
+ oDs = oCn.RunProcReturn("select HItemID ID,Hname Name,HStopflag Stopflag from Xt_ORGANIZATIONS", "Xt_ORGANIZATIONS");
+ objjson.code = "1";
+ objjson.count = 1;
+ objjson.Message = "鑾峰彇鎴愬姛锛�";
+ objjson.data = oDs.Tables[0];
+ return objjson; ;
+ }
+ catch (Exception e)
+ {
+
+ objjson.code = "0";
+ objjson.count = 0;
+ objjson.Message = "鑾峰彇澶辫触锛佸紓甯�" + e.ToString();
+ objjson.data = null;
+ return objjson; ;
+ }
+ }
+
/// <summary>
/// 鐧诲綍
/// </summary>
@@ -148,7 +180,15 @@
DataSet ds = null;
ClsCNSRM oCnLoc = new ClsCNSRM();
DAL.ClsUser oUser = new DAL.ClsUser();
- ds = oUser.CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
+ Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
+ string sReturn = "娴嬭瘯";
+ string FCusName = oSystemParameter.GetSingleSystemParameter("WMS_CampanyName", ref sReturn);
+ //LogService.Write(sReturn);
+ //LogService.Write(FCusName);
+ if (FCusName == "澶忓疂鐢靛櫒")
+ ds = oUser.CheckMainID(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
+ else
+ ds = oUser.CheckCzymc(UserName.Trim(), DBUtility.ClsPub.StrToPsd(PassWord.Trim()));
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -201,7 +241,7 @@
return objJsonResult; ;
}
//===========
- oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czybm='" + UserName + "'", "Gy_Czygl");
+ oDs = oCn.RunProcReturn("select Czmm from Gy_Czygl where Czymc='" + UserName + "'", "Gy_Czygl");
if (oDs == null || oDs.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -212,7 +252,7 @@
}
else
{
- oCn.RunProc("update Gy_Czygl set Czmm='" + DBUtility.ClsPub.StrToPsd(PassWord.Trim()) + "' where Czybm='" + UserName.Trim() + "'");
+ oCn.RunProc("update Gy_Czygl set Czmm='" + DBUtility.ClsPub.StrToPsd(PassWord.Trim()) + "' where Czymc='" + UserName.Trim() + "'");
objJsonResult.code = "0";
objJsonResult.count = 1;
objJsonResult.Message = "* 瀵嗙爜淇敼鎴愬姛锛�";
@@ -744,7 +784,8 @@
objJsonResult.Message = "杩斿洖鏁版嵁鎴愬姛锛�";
objJsonResult.data = oDs;
}
- else {
+ else
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "杩斿洖鏁版嵁澶辫触锛�";
@@ -757,17 +798,17 @@
#region[鏇存敼鍏憡鐘舵�乚
[Route("UpdateMessage")]
[HttpGet]
- public object UpdateMessage(string UserName, string HInterID,string HEntryID)
+ public object UpdateMessage(string UserName, string HInterID, string HEntryID)
{
ClsCNSRM oCn = new ClsCNSRM();
oCn.BeginTran();
- oCn.RunProc("Update OA_InformBillSub set HReadFlag=1 HUpDater='"+ UserName + "',HUpDateDate=getdate() where HInterID='" + HInterID + "' and HEntryID='"+ HEntryID + "'", ref ClsPub.sExeReturnInfo);
+ oCn.RunProc("Update OA_InformBillSub set HReadFlag=1 HUpDater='" + UserName + "',HUpDateDate=getdate() where HInterID='" + HInterID + "' and HEntryID='" + HEntryID + "'", ref ClsPub.sExeReturnInfo);
oCn.Commit();
objjson.code = "1";
objjson.count = 1;
- objjson.Message =ClsPub.sExeReturnInfo;
+ objjson.Message = ClsPub.sExeReturnInfo;
objjson.data = null;
- return objjson;;
+ return objjson; ;
}
#endregion
}
--
Gitblit v1.9.1