From f4e89066f9119fac831b64f388516aeb01c7dd60 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期三, 03 十一月 2021 16:59:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/WebAPIController.cs | 43 +++++++++++++++++++++++++++----------------
1 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/WebAPI/Controllers/WebAPIController.cs b/WebAPI/Controllers/WebAPIController.cs
index e783b85..ab01574 100644
--- a/WebAPI/Controllers/WebAPIController.cs
+++ b/WebAPI/Controllers/WebAPIController.cs
@@ -83,10 +83,11 @@
/// </summary>
/// <param name="UserName">鐢ㄦ埛鍚�</param>
/// <param name="PassWord">瀵嗙爜</param>
+ /// <param name="PassWord">缁勭粐</param>
/// <returns></returns>
[Route("Web/GetUser")]
[HttpGet]
- public object GetUser(string UserName, string PassWord)
+ public object GetUser(string UserName, string PassWord, string HOrgName)
{
try
{
@@ -102,14 +103,24 @@
objjson.data = null;
return objjson;
}
- else
+ string sql = string.Format(@" select a.* from Gy_UserByOrgRelation a
+ where a.HUserID = '{0}' and a.HOrgID = '{1}'", UserName, HOrgName);
+ DataSet _ds = oCnLoc.RunProcReturn(sql, "h_p_Xt_UserRelationOrg_Check");
+ if (_ds == null || _ds.Tables[0].Rows.Count == 0)
{
objjson.code = "0";
- objjson.count = 1;
- objjson.Message = "鐧诲綍鎴愬姛锛�";
- objjson.data = ds.Tables[0];
+ objjson.count = 0;
+ objjson.Message = "鐢ㄦ埛" + UserName + "娌℃湁璇ョ粍缁囨潈闄�";
+ objjson.data = null;
return objjson;
}
+
+ objjson.code = "0";
+ objjson.count = 1;
+ objjson.Message = "鐧诲綍鎴愬姛锛�";
+ objjson.data = ds.Tables[0];
+ return objjson;
+
}
catch (Exception)
{
@@ -1281,7 +1292,7 @@
{
//sWhere = " Where HStopFlag=0 and HEndFlag=1";
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
- if (BadReason != ""&& BadReason != null)
+ if (BadReason != "" && BadReason != null)
{
sWhere = sWhere + " and ( HNumber like '%" + BadReason + "%' or HName like '%" + BadReason + "%' ) ";
}
@@ -1737,9 +1748,9 @@
sWhere = " Where HStopFlag=0 and HEndFlag=1";
SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
- if (CheckItem != ""&& CheckItem!=null)
+ if (CheckItem != "" && CheckItem != null)
{
- sWhere = sWhere + " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) ";
+ sWhere = sWhere + " and ( HNumber like '%" + CheckItem + "%' or HName like '%" + CheckItem + "%' ) ";
ds = oCN.RunProcReturn("Select HItemID,HNumber,HName from Gy_DotCheck " + sWhere + " Order by HItemID ", "Gy_DotCheck");
}
else
@@ -1782,7 +1793,7 @@
/// <returns></returns>
[Route("Web/GetSc_ICMOBillListView")]
[HttpGet]
- public object GetSc_ICMOBillListView(string ICMOBill,int OrganizationID)
+ public object GetSc_ICMOBillListView(string ICMOBill, int OrganizationID)
{
if (ICMOBill != "")
{
@@ -1797,7 +1808,7 @@
}
else
{
- string sql = "select * from h_v_IF_ICMOBillList "+ sWhere+ " and isnull(瀹℃牳浜�,'')<>'' and isnull(鍏抽棴浜�,'')='' and isnull(琛屽叧闂汉,'')='' order by 鍗曟嵁鍙� desc,hsubid ";
+ string sql = "select * from h_v_IF_ICMOBillList " + sWhere + " and isnull(瀹℃牳浜�,'')<>'' and isnull(鍏抽棴浜�,'')='' and isnull(琛屽叧闂汉,'')='' order by 鍗曟嵁鍙� desc,hsubid ";
ds = oCN.RunProcReturn(sql, "h_v_IF_ICMOBillList");
}
if (ds == null || ds.Tables[0].Rows.Count <= 0)
@@ -1937,7 +1948,7 @@
/// <returns></returns>
[Route("Web/GetGy_QCCheckItem")]
[HttpGet]
- public object GetGy_QCCheckItem(string CheckItem,int OrganizationID)
+ public object GetGy_QCCheckItem(string CheckItem, int OrganizationID)
{
if (CheckItem != "")
{
@@ -2132,7 +2143,7 @@
/// <returns></returns>
[Route("Web/GetWMSBarCodeDetailsList")]
[HttpGet]
- public object GetWMSBarCodeDetailsList(int HInterID,string HBillType)
+ public object GetWMSBarCodeDetailsList(int HInterID, string HBillType)
{
try
{
@@ -2214,25 +2225,25 @@
//string json = JsonConvert.SerializeObject(dd);
for (int i = 0; i < ds.Tables[0].Rows.Count; i++) //杩欓噷鏄惊鐜墍鏈�
{
- if (ds.Tables[0].Rows[i]["HPartentID"].ToString()=="0" || ds.Tables[0].Rows[i]["HitemID"].ToString() == ds.Tables[0].Rows[i]["HPartentID"].ToString()) //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
+ if (ds.Tables[0].Rows[i]["HPartentID"].ToString() == "0" || ds.Tables[0].Rows[i]["HitemID"].ToString() == ds.Tables[0].Rows[i]["HPartentID"].ToString()) //鍒ゆ柇鏄惁鏈�澶栧眰鏍硅妭鐐�
{
Menu tbj = new Menu();
tbj.HitemID = ds.Tables[0].Rows[i]["HitemID"].ToString();
tbj.HNumber = ds.Tables[0].Rows[i]["HNumber"].ToString();
tbj.HName = ds.Tables[0].Rows[i]["HName"].ToString();
- tbj.HPartentID =ds.Tables[0].Rows[i]["HPartentID"].ToString();
+ tbj.HPartentID = ds.Tables[0].Rows[i]["HPartentID"].ToString();
tbj.HLevel = int.Parse(ds.Tables[0].Rows[i]["HLevel"].ToString());
tbj.Hurl = ds.Tables[0].Rows[i]["Hurl"].ToString();
mu.Add(tbj);
}
}
ToHierarchy.digui(ds.Tables[0], mu);
-
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "鍒犻櫎鎴愬姛锛�";
- objJsonResult.data =Newtonsoft.Json.JsonConvert.SerializeObject(mu);
+ objJsonResult.data = Newtonsoft.Json.JsonConvert.SerializeObject(mu);
return objJsonResult;
}
catch (Exception e)
--
Gitblit v1.9.1