From cf85f9443dc91cc8ee4e3a9b79e903b6635b13ac Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 09 十一月 2021 16:02:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/Controllers/POInStockBackController.cs | 4 ++--
WebAPI/Controllers/POOrderController.cs | 2 +-
WebAPI/Controllers/EntrustOrderController.cs | 4 ++--
WebAPI/Controllers/POInStockController.cs | 5 +++--
WebAPI/Controllers/PODemandPlanController.cs | 4 ++--
WebAPI/Controllers/BarCodeController.cs | 4 ++--
WebAPI/Controllers/ReportController.cs | 12 ++++++------
7 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/WebAPI/Controllers/BarCodeController.cs b/WebAPI/Controllers/BarCodeController.cs
index 8a48030..f444ac1 100644
--- a/WebAPI/Controllers/BarCodeController.cs
+++ b/WebAPI/Controllers/BarCodeController.cs
@@ -1112,12 +1112,12 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=''" + HSupNo.Trim() + "'') " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=''" + HSupNo.Trim() + "'') " + sqlWhere;
// msg = " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=''" + HSupNo.Trim() + "'') " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=''" + HSupNo.Trim() + "'') " + sqlWhere;
// msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
//杞崲鐗规畩瀛楃
diff --git a/WebAPI/Controllers/EntrustOrderController.cs b/WebAPI/Controllers/EntrustOrderController.cs
index bf2fdb3..71eb83b 100644
--- a/WebAPI/Controllers/EntrustOrderController.cs
+++ b/WebAPI/Controllers/EntrustOrderController.cs
@@ -41,12 +41,12 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
//杞崲鐗规畩瀛楃
diff --git a/WebAPI/Controllers/PODemandPlanController.cs b/WebAPI/Controllers/PODemandPlanController.cs
index ad24e71..b8e45cb 100644
--- a/WebAPI/Controllers/PODemandPlanController.cs
+++ b/WebAPI/Controllers/PODemandPlanController.cs
@@ -41,12 +41,12 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
//杞崲鐗规畩瀛楃
diff --git a/WebAPI/Controllers/POInStockBackController.cs b/WebAPI/Controllers/POInStockBackController.cs
index a07c93a..b7b643f 100644
--- a/WebAPI/Controllers/POInStockBackController.cs
+++ b/WebAPI/Controllers/POInStockBackController.cs
@@ -44,12 +44,12 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=''" + HSupNo.Trim() + "'') " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=''" + HSupNo.Trim() + "'') " + sqlWhere;
// msg = " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=''" + HSupNo.Trim() + "'') " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=''" + HSupNo.Trim() + "'') " + sqlWhere;
// msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
//杞崲鐗规畩瀛楃
diff --git a/WebAPI/Controllers/POInStockController.cs b/WebAPI/Controllers/POInStockController.cs
index ae6a731..674312a 100644
--- a/WebAPI/Controllers/POInStockController.cs
+++ b/WebAPI/Controllers/POInStockController.cs
@@ -423,12 +423,12 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
//杞崲鐗规畩瀛楃
@@ -444,6 +444,7 @@
Int64 RowTotal = Common.GetRowTotal("H_v_SRM_POInStockBillList", VsWhere, ref DBUtility.ClsPub.sExeReturnInfo);
//鑾峰彇杩斿洖鏁版嵁
ds = oCn.RunProcReturn("exec H_p_SRM_POInStockBillList '" + PcWhere + "'", "H_p_SRM_POInStockBillList");
+ LogService.Write("exec H_p_SRM_POInStockBillList '" + PcWhere + "'");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objjson.code = "0";
diff --git a/WebAPI/Controllers/POOrderController.cs b/WebAPI/Controllers/POOrderController.cs
index 0fb66d7..7a70af9 100644
--- a/WebAPI/Controllers/POOrderController.cs
+++ b/WebAPI/Controllers/POOrderController.cs
@@ -48,7 +48,7 @@
else
{
msg += " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛 =^^" + HSupNo.Trim() + "^^) " + sqlWhere;
- //msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ //msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
// msg = msg + " Where hsupid in (select hsupid from Gy_UserSupplierRelation where HUserID=^^" + System.Web.HttpContext.Current.Session["HUserName"].ToString() + "^^)";
}
//杞崲鐗规畩瀛楃
diff --git a/WebAPI/Controllers/ReportController.cs b/WebAPI/Controllers/ReportController.cs
index dada4f0..fdfefd9 100644
--- a/WebAPI/Controllers/ReportController.cs
+++ b/WebAPI/Controllers/ReportController.cs
@@ -44,11 +44,11 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
}
//杞崲鐗规畩瀛楃
if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
@@ -112,11 +112,11 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
}
//杞崲鐗规畩瀛楃
if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
@@ -182,11 +182,11 @@
//鍏朵粬杩囨护
if (msg.Trim() == "")
{
- msg = " Where hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = " Where hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
}
else
{
- msg = msg + " and hsupid in (select HItemID from h_v_IF_Supplier where hnumber=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
+ msg = msg + " and hsupid in (select HSupID from h_v_Gy_UserSupplierList where 鐢ㄦ埛=^^" + HSupNo.Trim() + "^^) " + sqlWhere;
}
//杞崲鐗规畩瀛楃
if (Common.SQLtoChange(msg, ref VsWhere, ref PcWhere) == false)
--
Gitblit v1.9.1