From bae6f41fd7ab5f4c572e196a0646f61ec6fb03f2 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 26 一月 2022 16:25:36 +0800
Subject: [PATCH] 条码主档 采购管理 权限编辑
---
WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs | 3
WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs | 26 ++++
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 12 ++
WebAPI/Controllers/仓存管理/委外用料/WW_PPBomBillController.cs | 12 +
WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs | 13 ++
WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs | 12 ++
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBillController.cs | 2
WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs | 12 ++
WebAPI/Controllers/仓存管理/领料发货/Kf_MateOutBackBillController.cs | 2
WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs | 50 +++++++--
WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs | 64 ++++++++----
WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs | 34 ++++--
12 files changed, 181 insertions(+), 61 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 6ecfc85..d1a9256 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -457,10 +457,20 @@
/// </summary>
[Route("Gy_BarCodeBillList/GetBarCodeBillList")]
[HttpGet]
- public object GetBarCodeBillList(string sWhere)
+ public object GetBarCodeBillList(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList " + sWhere + "order by 鏃ユ湡 desc", "h_v_IF_BarCodeBillList");
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
index bc8a779..33967aa 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBackBillController.cs
@@ -65,10 +65,20 @@
/// </summary>
[Route("Cg_POInStockBackBill/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBackBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBackBillList " + sWhere, "h_v_IF_POInStockBackBillList");
diff --git a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
index 641981d..737a220 100644
--- a/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POInStockBillController.cs
@@ -67,10 +67,20 @@
/// </summary>
[Route("Cg_POInStockBill/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_POInStockBillList " + sWhere, "h_v_IF_POInStockBillList");
@@ -246,7 +256,7 @@
try
{
//鍒ゆ柇鏄惁鏈夊垹闄ょ殑鏉冮檺
- if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBill_Drop", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBill_Drop", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -286,10 +296,20 @@
/// </summary>
[Route("Cg_POInStockBill/DeAuditPOInStockBill")]
[HttpGet]
- public object DeAuditPOInStockBill(string HInterID)
+ public object DeAuditPOInStockBill(string HInterID,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夊鏍哥殑鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log("Cg_POInStockBill_Check", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鏍告潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
//鍏堝垹闄� 閲戣澏鏁版嵁
objJsonResult = DeleteKingDee(HInterID);
if (objJsonResult.code == "0")
diff --git a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
index 2185301..c273dd4 100644
--- a/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_POOrderBillController.cs
@@ -32,20 +32,44 @@
{
try
{
- //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
- bool isCgjl = Security_Log("Cg_POOrderBill_PurchasManager", 1, false, user);
- if (!isCgjl)
- {
- sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
- }
- string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 " + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ if (!DBUtility.ClsPub.Security_Log("Cg_POOrderBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡鐪�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ string sql = "select * from h_v_IF_POOrderBillList where 1 = 1 ";
+
+ if (sWhere=="" || sWhere == null)
+ {
+ ds = oCN.RunProcReturn(sql, "h_v_IF_POOrderBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql + sWhere, "h_v_IF_POOrderBillList");
+ }
+
+ if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳暟鎹�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs b/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
index 796b6e2..f9c1df9 100644
--- a/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
+++ b/WebAPI/Controllers/CGGL/Cg_PurchaseReturnController.cs
@@ -19,10 +19,20 @@
#region 閲囪喘閫�鏂欏崟 鏌ヨ鍒楄〃
[Route("Cg_PurchaseReturn/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_PurchaseReturnBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_Kf_PurchaseReturnList ", "h_v_Kf_PurchaseReturnList");
@@ -64,18 +74,20 @@
[HttpGet]
public object AuditProcessReportList(int HInterID, int IsAudit, string CurUserName)
{
- //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
- //缂栬緫鏉冮檺
- //if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdMoveBill_Check", 1, false, CurUserName))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+
try
{
+ //flag=1 瀹℃牳锛� flag=2 鍙嶅鏍�
+ //缂栬緫鏉冮檺
+ if (!DBUtility.ClsPub.Security_Log_second("Cg_PurchaseReturnBill_Check", 1, false, CurUserName))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犲鏍告潈闄愶紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
Int64 lngBillKey = 0;
lngBillKey = DBUtility.ClsPub.isLong(HInterID);
if (lngBillKey == 0)
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
index 2988eae..6fc6675 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBackBillController.cs
@@ -20,13 +20,22 @@
DataSet ds;
#region 閲囪喘閫�鏂欏崟鍒楄〃
-
[Route("Kf_POStockInBackBill/Get_POStockInBackBillList")]
[HttpGet]
- public object Get_POStockInBackBillList(string sWhere)
+ public object Get_POStockInBackBillList(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Cg_PurchaseReturnBill_Query", 1,false,user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
ds = oCN.RunProcReturn("select * from h_v_Kf_POStockInBackBillList " + sWhere + " order by 鏃ユ湡 desc", "h_v_Kf_POStockInBackBillList");
objJsonResult.code = "1";
objJsonResult.count = 1;
diff --git a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
index 1e37d71..5fdb889 100644
--- a/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
+++ b/WebAPI/Controllers/CGGL/Kf_POStockInBillController.cs
@@ -60,7 +60,8 @@
}
/// <summary>
- /// 杩斿洖鏀舵枡閫氱煡鍗曞垪琛�
+ /// --杩斿洖鏀舵枡閫氱煡鍗曞垪琛�
+ /// 澶栬喘鍏ュ簱鍗� 1201
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
diff --git a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
index dee19ee..d0729e0 100644
--- a/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
+++ b/WebAPI/Controllers/CGGL/WW_EntrustOrderBillController.cs
@@ -31,31 +31,51 @@
{
try
{
- //if (sWhere == null || sWhere.Equals(""))
- //{
- // ds = oCN.RunProcReturn("select * from h_v_IF_EntrustOrderBillList " + sWhere, "h_v_IF_EntrustOrderBillList");
- //}
- //else
- //{
- // string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
- // string sql = sql1 + sWhere;
- // ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
- //}
-
- //鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
- bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
- if (!isCgjl)
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_EntrustOrderBillQuery", 1, false, user))
{
- sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
}
- string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
- ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
+ string sql1 = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 ";
+ if (sWhere == null || sWhere.Equals(""))
+ {
+ ds = oCN.RunProcReturn(sql1, "h_v_IF_EntrustOrderBillList");
+ }
+ else
+ {
+ ds = oCN.RunProcReturn(sql1+ sWhere, "h_v_IF_EntrustOrderBillList");
+ }
+
+ ////鍒ゆ柇鏄惁鏈夐噰璐粡鐞嗘潈闄�
+ //bool isCgjl = Security_Log("WW_EntrustOrderBill_PurchasManager", 1, false, user);
+ //if (!isCgjl)
+ //{
+ // sWhere += $" and HEmpID in (select HEmpID from Gy_Czygl where Czymc='{user}' )";
+ //}
+ //string sql = "select * from h_v_IF_EntrustOrderBillList where 1 = 1 " + sWhere;
+ //ds = oCN.RunProcReturn(sql, "h_v_IF_EntrustOrderBillList");
+
+ if (ds.Tables[0].Rows.Count == 0 || ds == null)
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犺褰�";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ else
+ {
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ }
}
catch (Exception e)
{
diff --git a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
index 6385e99..e8b6ad9 100644
--- a/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
+++ b/WebAPI/Controllers/XSGL/Xs_SeOutStockBackBillController.cs
@@ -27,10 +27,20 @@
/// </summary>
[Route("Xs_SeOutStockBackBill/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string user)
{
try
{
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("Xs_SeOutStockBackBillQuery", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳潈闄愭煡璇�!";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+
if (sWhere == null || sWhere.Equals(""))
{
ds = oCN.RunProcReturn("select * from h_v_IF_SeOutStockBackBillList " + sWhere, "h_v_IF_SeOutStockBackBillList");
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
index 9de2e99..e5df05a 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\345\247\224\345\244\226\347\224\250\346\226\231/WW_PPBomBillController.cs"
@@ -26,10 +26,14 @@
{
try
{
-
- if (!DBUtility.ClsPub.Security_Log("", 1, false, user))
- {
-
+ //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+ if (!DBUtility.ClsPub.Security_Log("WW_PPBomBill_Query", 1, false, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "鏃犳煡璇㈡潈闄�!";
+ objJsonResult.data = null;
+ return objJsonResult;
}
ds = WW_PPBomBillList(sWhere);
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
index 2f58d68..8addddf 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBackBillController.cs"
@@ -86,7 +86,7 @@
public object set_DeleteBill(string HInterID,string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_EntrustOutBill_Drop", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBackBill_Drop", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
diff --git "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs" "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
index 8d2dc5e..90f460c 100644
--- "a/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
+++ "b/WebAPI/Controllers/\344\273\223\345\255\230\347\256\241\347\220\206/\351\242\206\346\226\231\345\217\221\350\264\247/Kf_MateOutBillController.cs"
@@ -67,7 +67,7 @@
public object set_DeleteBill(string HInterID, string user)
{
//缂栬緫鏉冮檺
- if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Delete", 1, false, user))
+ if (!DBUtility.ClsPub.Security_Log_second("Kf_MateOutBill_Drop", 1, false, user))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
--
Gitblit v1.9.1