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 | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e15b8b0..df1ca51 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -180,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";
@@ -776,7 +784,8 @@
objJsonResult.Message = "杩斿洖鏁版嵁鎴愬姛锛�";
objJsonResult.data = oDs;
}
- else {
+ else
+ {
objJsonResult.code = "0";
objJsonResult.count = 0;
objJsonResult.Message = "杩斿洖鏁版嵁澶辫触锛�";
@@ -789,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