From 5d9636ba5741f6ff79c9401bce2626469c35323d Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 10 三月 2022 15:07:14 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs | 69 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index c3a1947..30f1fda 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -25,36 +25,35 @@
/// </summary>
[Route("Gy_Supplier/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user,string Organization)
{
try
{
- if (sWhere == null || sWhere.Equals(""))
- {
- ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere, "h_v_Gy_SupplierList");
- }
- else
- {
- string sql1 = "select * from h_v_Gy_SupplierList where 1 = 1 ";
- string sql = sql1 + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
- }
- if (ds == null || ds.Tables[0].Rows.Count == 0)
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Gy_Supplier", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
+ objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
+ string sql1 = string.Format(@"select * from h_v_Gy_SupplierList where 缁勭粐鍚嶇О='" + Organization + "'");
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by 渚涘簲鍟嗕唬鐮�", "h_v_Gy_SupplierList");
+ }
else
{
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql = sql1 + sWhere + " order by 渚涘簲鍟嗕唬鐮� ";
+ ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
}
+
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
}
catch (Exception e)
{
@@ -109,7 +108,16 @@
{
try
{
- ds = oCN.RunProcReturn("select * from Gy_Supplier where HItemID=" + HInterID, "Gy_Supplier");
+ string sql = string.Format(@"select s.HItemID,s.HNumber 缂栫爜,s.HName 鍚嶇О,s.HHelpCode 鍔╄鐮�,s.HShortName 绠�绉�,s.HAddress 鍦板潃,s.HLinkMan 鑱旂郴浜�,s.HLinkPhone 鑱旂郴鐢佃瘽
+ ,s.HMobilePhone 鎵嬫満,s.HFax 浼犵湡,s.HPostalCode 閭紪,s.HEmail 鐢靛瓙閭欢,s.HCorMan 娉曚汉浠ｈ〃,s.HBank 寮�鎴烽摱琛�,s.HBankAccount 閾惰璐﹀彿,
+ s.HTaxNum 绋庡姟鐧昏鍙�,s.HEnglishName 鑻辨枃鍚嶇О,s.HEngLishAddress 鑻辨枃鍦板潃,s.HCountry 鍥藉,s.HStopflag 绂佺敤鏍囧織
+ ,s.HRemark 澶囨敞,s.HAreaID 鍦板尯ID,a.HName 鍦板尯鍚嶇О,s.HTaxRate 澧炲�肩◣鐜�,s.HCurID 榛樿璐у竵ID,r.HName 榛樿璐у竵,
+ s.HSSID 缁撶畻鏂瑰紡ID,e.HName 缁撶畻鏂瑰紡 from Gy_Supplier s
+ left join Gy_AreaSet a on s.HAreaID=a.HItemID
+ left join Gy_Currency r on s.HCurID=r.HItemID
+ left join Gy_SettleStyle e on s.HSSID=e.HItemID
+ where s.HItemID='" + HInterID + "'");
+ ds = oCN.RunProcReturn(sql, "Gy_Supplier");
objJsonResult.code = "1";
objJsonResult.count = 1;
@@ -158,6 +166,7 @@
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
string HEndFlag = list[0].HEnfFlag;
+ string HStopflag = list[0].HStopflag;
string HHelpCode = list[0].HHelpCode;
string HShortName = list[0].HShortName;
string HAddress = list[0].HAddress;
@@ -208,7 +217,7 @@
",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
",HEnglishAddress,HCurID,HSSID,HAreaID) " +
" values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
- "," + HLevel + ",'0','0','" + HRemark + "'" +
+ "," + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
@@ -268,7 +277,7 @@
long HParentID = list[0].HParentID;
long HLevel = list[0].HLevel;
string HEndFlag = list[0].HEnfFlag;
- bool HStopflag = list[0].HStopflag;
+ string HStopflag = list[0].HStopflag;
string HHelpCode = list[0].HHelpCode;
string HShortName = list[0].HShortName;
string HAddress = list[0].HAddress;
@@ -298,11 +307,11 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
- objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
objJsonResult.data = null;
return objJsonResult;
}
@@ -317,16 +326,6 @@
return objJsonResult;
}
- if (oDept.HavSameNumber(HItemID, HNumber))
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "浠ｇ爜閲嶅锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
-
-
//鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
oCN.BeginTran();
//涓昏〃
@@ -336,7 +335,7 @@
",HShortNumber='" + HShortNumber + "'" +
",HParentID=" + HParentID.ToString() +
",HLevel=" + HLevel.ToString() +
- ",HStopflag=" + HStopflag +
+ ",HStopflag ='" + HStopflag + "'" +
",HRemark= '" + HRemark + "'" +
",HHelpCode='" + HHelpCode + "'" +
",HShortName='" + HShortName + "'" +
@@ -398,7 +397,7 @@
DAL.ClsGy_Supplier_View oGroupHlp = new DAL.ClsGy_Supplier_View();
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1