From bd443a23270ae3b33f30b8fdeb20b3ae2551cce2 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 13 十月 2021 17:36:12 +0800
Subject: [PATCH] 器具管理所有页面列表加登录组织过滤
---
WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs | 10 +-
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs | 10 +-
WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs | 10 +-
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 150 +++++++++++++++---------------
WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs | 10 +-
WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs | 10 +-
WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs | 12 +-
WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs | 12 +-
WebAPI/Controllers/Sc_MouldOtherInBillController.cs | 10 +-
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs | 10 +-
WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs | 34 +++---
11 files changed, 139 insertions(+), 139 deletions(-)
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
index b828264..a993580 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepInBillListController .cs
@@ -83,7 +83,7 @@
[Route("Sc_MouldMoveStockStepInBill/GetMouldMoveStockStepInBill")]
[HttpGet]
- public object GetMouldMoveStockStepInBill(string sWhere,string user)
+ public object GetMouldMoveStockStepInBill(string sWhere,string user,string Organization)
{
try
{
@@ -97,7 +97,7 @@
return objJsonResult;
}
- ds = Sc_MouldMoveStockStepInBill(sWhere);
+ ds = Sc_MouldMoveStockStepInBill(sWhere, Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -114,16 +114,16 @@
}
}
- public static DataSet Sc_MouldMoveStockStepInBill(string sWhere)
+ public static DataSet Sc_MouldMoveStockStepInBill(string sWhere,string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepInBillListDetail where 璋冨嚭缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMoveStockStepInBillListDetail ", "h_v_Sc_MouldMoveStockStepInBillListDetail");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldMoveStockStepInBillListDetail");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldMoveStockStepInBillListDetail where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepInBillListDetail");
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
index bc2bb41..5d9b0f3 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldMoveStockStepOutBillController.cs
@@ -83,7 +83,7 @@
[Route("Sc_MouldMoveStockStepOutBill/GetMouldMoveStockStepOutBill")]
[HttpGet]
- public object GetMouldMoveStockStepOutBill(string sWhere, string user)
+ public object GetMouldMoveStockStepOutBill(string sWhere, string user, string Organization)
{
try
{
@@ -97,7 +97,7 @@
return objJsonResult;
}
- ds = Sc_MouldMoveStockStepOutBill(sWhere);
+ ds = Sc_MouldMoveStockStepOutBill(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -114,15 +114,15 @@
}
}
- public static DataSet Sc_MouldMoveStockStepOutBill(string sWhere)
+ public static DataSet Sc_MouldMoveStockStepOutBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldMoveStockStepOutBill where 璋冨嚭缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMoveStockStepOutBill ", "h_v_Sc_MouldMoveStockStepOutBill");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1, "h_v_Sc_MouldMoveStockStepOutBill");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldMoveStockStepOutBill where 1 = 1 ";
string sql = sql1 + sWhere;
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldMoveStockStepOutBill");
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
index d70d501..63ede87 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldOtherOutBillController.cs
@@ -83,7 +83,7 @@
[Route("Sc_MouldOtherOutBill/GetMouldOtherOutBill")]
[HttpGet]
- public object GetMouldOtherOutBill(string sWhere,string user)
+ public object GetMouldOtherOutBill(string sWhere,string user, string Organization)
{
try
{
@@ -97,7 +97,7 @@
return objJsonResult;
}
- ds = Sc_MouldOtherOutBill(sWhere);
+ ds = Sc_MouldOtherOutBill(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -114,15 +114,15 @@
}
}
- public static DataSet Sc_MouldOtherOutBill(string sWhere)
+ public static DataSet Sc_MouldOtherOutBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherOutBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldOtherOutBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldOtherOutBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldOtherOutBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldOtherOutBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherOutBillList");
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index 2ab96e1..c53cc3a 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -23,7 +23,7 @@
[Route("Sc_MouldProdInBill/Get_MouldProdInBillList")]
[HttpGet]
- public object Get_MouldProdInBillList(string sWhere,string user)
+ public object Get_MouldProdInBillList(string sWhere,string user, string Organization)
{
try
{
@@ -37,7 +37,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldProdInHouseBill(sWhere);
+ ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);
if (ds == null)
{
objJsonResult.code = "0";
@@ -65,15 +65,15 @@
}
}
- public static DataSet Sc_GetMouldProdInHouseBill(string sWhere)
+ public static DataSet Sc_GetMouldProdInHouseBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdInHouseBillList order by 鏃ユ湡 desc " + sWhere, "h_v_Sc_MouldProdInHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdInHouseBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldProdInHouseBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
index 3ceb8c5..ad99263 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdMoveBillListController.cs
@@ -83,7 +83,7 @@
[Route("Sc_MouldProdMoveBill/GetMouldProdMoveBill")]
[HttpGet]
- public object GetMouldProdMoveBill(string sWhere,string user)
+ public object GetMouldProdMoveBill(string sWhere,string user, string Organization)
{
try
{
@@ -97,7 +97,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldProdMoveBill(sWhere);
+ ds = Sc_GetMouldProdMoveBill(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -114,15 +114,15 @@
}
}
- public static DataSet Sc_GetMouldProdMoveBill(string sWhere)
+ public static DataSet Sc_GetMouldProdMoveBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldProdMoveBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdMoveBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldProdMoveBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdMoveBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldProdMoveBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdMoveBillList");
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
index c159a2c..2039340 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldRepairOutBillController.cs
@@ -23,11 +23,11 @@
[Route("Sc_MouldRepairOutBill/Get_MouldRepairOutBillList")]
[HttpGet]
- public object Get_MouldRepairOutBillList(string sWhere,string user)
+ public object Get_MouldRepairOutBillList(string sWhere,string user, string Organization)
{
try
{
- ds = Sc_GetMouldRepairOutHouseBill(sWhere);
+ ds = Sc_GetMouldRepairOutHouseBill(sWhere,Organization);
if (ds == null)
{
//缂栬緫鏉冮檺
@@ -64,15 +64,15 @@
}
}
- public static DataSet Sc_GetMouldRepairOutHouseBill(string sWhere)
+ public static DataSet Sc_GetMouldRepairOutHouseBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairOutBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairOutBillList order by 鏃ユ湡 desc" + sWhere, "h_v_Sc_MouldRepairOutBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldRepairOutBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldRepairOutBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");
}
diff --git a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
index a27164f..7c75a5d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldScrapInBillController.cs
@@ -319,7 +319,7 @@
[Route("Sc_MouldScrapInBill/get_Display")]
[HttpGet]
- public object get_Display(string sWhere,string user)
+ public object get_Display(string sWhere,string user, string Organization)
{
try
{
@@ -333,7 +333,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldScrapInHouseBill(sWhere);
+ ds = Sc_GetMouldScrapInHouseBill(sWhere,Organization);
if (ds == null)
{
objJsonResult.code = "0";
@@ -361,16 +361,16 @@
}
}
- public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere)
+ public static DataSet Sc_GetMouldScrapInHouseBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapInHouseBillList " + sWhere, "h_v_Sc_MouldScrapInHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapInHouseBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
}
diff --git a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
index dd47554..b38fe11 100644
--- a/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
+++ b/WebAPI/Controllers/Sc_CheckToolsRepairWorkBillListController.cs
@@ -4213,7 +4213,7 @@
[Route("Sc_CheckToolsRepairWorkBillList/GetMouldRepairInBillList")]
[HttpGet]
- public object GetMouldRepairInBillList(string sWhere,string user)
+ public object GetMouldRepairInBillList(string sWhere,string user, string Organization)
{
try
{
@@ -4227,7 +4227,7 @@
return objJsonResult;
}
- ds = Sc_MouldRepairInBillList(sWhere);
+ ds = Sc_MouldRepairInBillList(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4244,15 +4244,15 @@
}
}
- public static DataSet Sc_MouldRepairInBillList(string sWhere)
+ public static DataSet Sc_MouldRepairInBillList(string sWhere,string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairInBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairInBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldRepairInBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldRepairInBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldRepairInBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairInBillList");
}
diff --git a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
index f1e382f..6b1c2db 100644
--- a/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
+++ b/WebAPI/Controllers/Sc_MouldOtherInBillController.cs
@@ -83,7 +83,7 @@
[Route("Sc_MouldOtherInBill/GetMouldOtherInBill")]
[HttpGet]
- public object GetMouldOtherInBill(string sWhere,string user)
+ public object GetMouldOtherInBill(string sWhere,string user, string Organization)
{
try
{
@@ -97,7 +97,7 @@
return objJsonResult;
}
- ds = Sc_MouldOtherInBill(sWhere);
+ ds = Sc_MouldOtherInBill(sWhere, Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -114,15 +114,15 @@
}
}
- public static DataSet Sc_MouldOtherInBill(string sWhere)
+ public static DataSet Sc_MouldOtherInBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldOtherInBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldOtherInBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldOtherInBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldOtherInBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldOtherInBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldOtherInBillList");
}
diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
index 9543a17..b4bf9a6 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
@@ -3756,7 +3756,7 @@
[Route("Sc_MouldScrapOutHouseBill/GetMouldScrapOutHouseBill")]
[HttpGet]
- public object GetMouldScrapOutHouseBill(string sWhere,string user)
+ public object GetMouldScrapOutHouseBill(string sWhere,string user, string Organization)
{
try
{
@@ -3770,7 +3770,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldScrapOutHouseBill(sWhere);
+ ds = Sc_GetMouldScrapOutHouseBill(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -3787,15 +3787,15 @@
}
}
- public static DataSet Sc_GetMouldScrapOutHouseBill(string sWhere)
+ public static DataSet Sc_GetMouldScrapOutHouseBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldScrapOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldScrapOutHouseBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapOutHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldScrapOutHouseBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldScrapOutHouseBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
}
@@ -4241,11 +4241,11 @@
[Route("Sc_MouldProdBackBill/GetMouldProdBackBill")]
[HttpGet]
- public object GetMouldProdBackBill(string sWhere,string user,string ModRightNameSelect)
+ public object GetMouldProdBackBill(string sWhere,string user, string Organization)
{
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBillList", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4254,7 +4254,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldProdBackBill(sWhere);
+ ds = Sc_GetMouldProdBackBill(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4271,15 +4271,15 @@
}
}
- public static DataSet Sc_GetMouldProdBackBill(string sWhere)
+ public static DataSet Sc_GetMouldProdBackBill(string sWhere,string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldProdBackBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdBackBillList order by 鏃ユ湡 desc ", "h_v_Sc_MouldProdBackBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1 + "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdBackBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldProdBackBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
}
@@ -4586,11 +4586,11 @@
[Route("Sc_MouldProdOutBill/GetMouldProdOutBill")]
[HttpGet]
- public object GetMouldProdOutBill(string sWhere, string user, string ModRightNameSelect)
+ public object GetMouldProdOutBill(string sWhere, string user,string Organization)
{
try
{
- if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBillList", 1, true, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -4599,7 +4599,7 @@
return objJsonResult;
}
- ds = Sc_GetMouldProdOutBill(sWhere);
+ ds = Sc_GetMouldProdOutBill(sWhere,Organization);
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4616,15 +4616,15 @@
}
}
- public static DataSet Sc_GetMouldProdOutBill(string sWhere)
+ public static DataSet Sc_GetMouldProdOutBill(string sWhere, string Organization)
{
+ string sql1 = string.Format(@"select * from h_v_Sc_MouldProdOutHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdOutHouseBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldProdOutHouseBillList");
+ return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdOutHouseBillList");
}
else
{
- string sql1 = "select * from h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ";
string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
}
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index f2aefa8..21c4d17 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="bin/Antlr3.Runtime.dll">
<publishTime>02/22/2013 08:43:40</publishTime>
@@ -18,31 +18,31 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>10/12/2021 14:40:22</publishTime>
+ <publishTime>10/13/2021 14:31:58</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>10/12/2021 14:40:22</publishTime>
+ <publishTime>10/13/2021 14:31:58</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>10/12/2021 14:40:20</publishTime>
+ <publishTime>10/13/2021 14:31:55</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>10/12/2021 14:40:20</publishTime>
+ <publishTime>10/13/2021 14:31:55</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>10/12/2021 09:01:59</publishTime>
+ <publishTime>10/13/2021 14:31:49</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>10/12/2021 09:01:59</publishTime>
+ <publishTime>10/13/2021 14:31:49</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>10/11/2021 09:26:35</publishTime>
+ <publishTime>08/16/2021 17:23:13</publishTime>
</File>
<File Include="bin/Kingdee.BOS.WebApi.FormService.dll">
<publishTime>09/20/2018 19:23:20</publishTime>
@@ -60,34 +60,34 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>10/12/2021 14:40:17</publishTime>
+ <publishTime>10/13/2021 14:31:50</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>10/12/2021 14:40:17</publishTime>
+ <publishTime>10/13/2021 14:31:50</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="bin/Newtonsoft.Json.dll">
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>10/12/2021 09:01:57</publishTime>
+ <publishTime>10/13/2021 14:31:47</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>10/12/2021 09:01:57</publishTime>
+ <publishTime>10/13/2021 14:31:47</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>10/12/2021 09:01:58</publishTime>
+ <publishTime>10/13/2021 14:31:48</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>10/12/2021 09:01:58</publishTime>
+ <publishTime>10/13/2021 14:31:48</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>10/12/2021 09:01:58</publishTime>
+ <publishTime>10/13/2021 14:31:48</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>10/12/2021 09:01:58</publishTime>
+ <publishTime>10/13/2021 14:31:48</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -156,7 +156,7 @@
<publishTime>11/28/2018 13:01:00</publishTime>
</File>
<File Include="bin/System.Web.Http.WebHost.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="bin/System.Web.Mvc.dll">
<publishTime>01/28/2015 04:02:18</publishTime>
@@ -189,181 +189,181 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>10/12/2021 14:38:15</publishTime>
+ <publishTime>10/13/2021 14:32:04</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>10/12/2021 14:38:15</publishTime>
+ <publishTime>10/13/2021 14:32:04</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
</File>
<File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll">
- <publishTime>11/29/2018 21:26:02</publishTime>
+ <publishTime>11/29/2018 13:26:02</publishTime>
</File>
<File Include="bin/zh-Hans/System.Web.Http.resources.dll">
- <publishTime>11/29/2018 21:26:30</publishTime>
+ <publishTime>11/29/2018 13:26:30</publishTime>
</File>
<File Include="Content/bootstrap.css">
- <publishTime>10/11/2021 09:26:37</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/bootstrap.min.css">
- <publishTime>10/11/2021 09:26:37</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Content/Site.css">
- <publishTime>10/11/2021 09:26:37</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/BLL.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DAL.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/DBUtility.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Kingdee.BOS.WebApi.Client.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Model.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Newtonsoft.Json.Net35.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Class.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/Pub_Control.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="DLL/SQLHelper.dll">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.eot">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.svg">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.ttf">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="fonts/glyphicons-halflings-regular.woff">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Global.asax">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Index.html">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="packages.config">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:16</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/bootstrap.min.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery-1.10.2.min.map">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.min.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/jquery.validate.unobtrusive.min.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Scripts/modernizr-2.6.2.js">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/Error.cshtml">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/Shared/_Layout.cshtml">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/web.config">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Views/_ViewStart.cshtml">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Customer_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Department_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Employee_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BadReason_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Customer_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Department_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Employee_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Group_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Source_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Supplier_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource">
- <publishTime>10/11/2021 09:26:38</publishTime>
+ <publishTime>08/16/2021 17:23:15</publishTime>
</File>
<File Include="Web References/WebS/Reference.map">
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>10/11/2021 09:31:00</publishTime>
+ <publishTime>10/13/2021 14:32:17</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1