From dac1d793ad118eebf9048588a356ae0ea8a3aa95 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 10 二月 2022 17:42:41 +0800
Subject: [PATCH] 基础建模每个模块的权限

---
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs |   95 ++++++++++++++++++++++++++++++++---------------
 1 files changed, 65 insertions(+), 30 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 0c3a0cc..778181b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -27,18 +27,27 @@
         /// </summary>
         [Route("Gy_Material/list")]
         [HttpGet]
-        public object list(string sWhere, string Organization)
+        public object list(string sWhere,string user, string Organization)
         {
             try
             {
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_Material", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
                 string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 缁勭粐鍚嶇О='" + Organization + "'");
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_MaterialList");
+                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鐗╂枡浠g爜 ", "h_v_Gy_MaterialList");
                 }
                 else
                 {
-                    string sql = sql1 + sWhere + "order by HItemID desc";
+                    string sql = sql1 + sWhere + " order by 鐗╂枡浠g爜 ";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
                 }
 
@@ -80,12 +89,23 @@
         {
             DataSet ds;
             var _value = msg["msg"].ToString();
-            string msg1 = _value.ToString();
-            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
-            //string msg2 = sArray[0].ToString();
-            //string msg3 = sArray[1].ToString();
+            string msg3 = _value.ToString();
+            string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg1 = sArray[0].ToString();
+            string msg2 = sArray[1].ToString();
             Int64 HItemID = 0;
             SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
+
+            //缂栬緫鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log_second("Gy_Material_Edit", 1, false, msg2))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
             //鑾峰彇鏈�澶D鍊艰祴鍊�
             DataSet Maxds = oCN.RunProcReturn("select MAX(HItemID) HItemID from Gy_Material ", "Gy_Material");
             if (Maxds != null || Maxds.Tables[0].Rows.Count > 0)
@@ -96,6 +116,7 @@
                 HItemID = maxid;
             }
             ListModels oListModels = new ListModels();
+            
             try
             {
                 DLL.ClsGy_Material_Ctl oBill = new DLL.ClsGy_Material_Ctl();
@@ -276,21 +297,20 @@
         /// <returns></returns>
         [Route("Gy_Material/Delete")]
         [HttpGet]
-        public object DeltetGy_Material(string HItemID)
+        public object DeltetGy_Material(string HItemID,string user)
         {
             DataSet ds;
-            //string ModRightNameCheck = "Sc_ProcessReport_check";
             try
             {
                 //鍒犻櫎鏉冮檺
-                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
-                //{
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
+                if (!DBUtility.ClsPub.Security_Log("Gy_Material_Delete", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (string.IsNullOrWhiteSpace(HItemID))
@@ -353,7 +373,7 @@
         {
             try
             {
-                if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, false, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -363,12 +383,12 @@
                 }
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by hmainid desc", "h_v_Gy_MouldFileList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
-                    string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+                    string sql = sql1 + sWhere + "order by hmainid desc";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -457,18 +477,28 @@
         /// </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");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList order by hmainid desc", "h_v_IF_BarCodeBillList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
-                    string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+                    string sql = sql1 + sWhere + "order by hmainid desc";
                     ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -517,7 +547,7 @@
             string msg4 = sArray[2].ToString();//褰撳墠浜�
 
             oCN.BeginTran();
-            if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
+            if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
@@ -594,6 +624,8 @@
                 int HCaveQty = mainList[0].HCaveQty;
                 int HMouldDotCheckRuleInterID= mainList[0].HMouldDotCheckRuleInterID;
                 int HMouldMaintainRuleInterID= mainList[0].HMouldMaintainRuleInterID;
+                int HNowSupID = mainList[0].HNowSupID;
+                int HNowSupTypeID = mainList[0].HNowSupTypeID;
 
 
 
@@ -606,7 +638,7 @@
                 ",HMaterID,HMaterNumber,HMouldType,HUnitID" +
                 ",HOutComDate,HOutComNo,HDeptID,HSupID,HSupNumber" +
                 ",HPrintQty,HMouldStatus,HWhID,HRoutingID,HCaveQty" +
-                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife" +
+                ",HBomID,HVersion,HSPGroupID,HSPID,HDesignLife,HNowSupID,HNowSupTypeID" +
                 ",HUseLife,HLeaveLife,HProdQty,HProdWeight,HMouldOWNER,HSaveLife,HMouldDotCheckRuleInterID,HMouldMaintainRuleInterID" +
                 ") " +
                 " values('" + BillType + "','" + BillType + "'," + HInterID + ",'" + HBillNo + "','" + HDate + "'" +
@@ -616,7 +648,7 @@
                 "," + HMaterID + ",'" + HMaterNumber + "'," + HMouleTypeID + "," + HUnitID +
                 ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HSupID + ",'" + HSupNumber + "'" +
                 "," + HPrintQty + ",'" + HMouldStatus + "'," + HWHID + "," + HRoutingID +","+ HCaveQty+
-                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "'" +
+                "," + HBOMID + ",'" + HVersion + "'," + HSPGroupID + "," + HSPID + ",'" + HDesignLife + "','" + HNowSupID+"','"+ HNowSupTypeID+"'"+
                 ",'" + HUseLife + "','" + HLeaveLife + "','" + HProdQty + "','" + HProdWeight + "','" + HMouldOWNER + "','" + HSaveLife + "','" + HMouldDotCheckRuleInterID+"','"+ HMouldMaintainRuleInterID+"'"+
                 ") ");
 
@@ -673,7 +705,7 @@
             string msg4 = sArray[2].ToString();//褰撳墠浜�
             try
             {
-                if (!DBUtility.ClsPub.Security_Log(msg3, 1, true, msg4))
+                if (!DBUtility.ClsPub.Security_Log(msg3, 1, false, msg4))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -732,7 +764,8 @@
                 int HCaveQty = mainList[0].HCaveQty;
                 int HMouldDotCheckRuleInterID = mainList[0].HMouldDotCheckRuleInterID;
                 int HMouldMaintainRuleInterID = mainList[0].HMouldMaintainRuleInterID;
-
+                int HNowSupID = mainList[0].HNowSupID;
+                int HNowSupTypeID = mainList[0].HNowSupTypeID;
 
                 //鑻AINDI閲嶅鍒欓噸鏂拌幏鍙�
                 oCN.BeginTran();
@@ -781,6 +814,8 @@
                 ",HMouldDotCheckRuleInterID="+ HMouldDotCheckRuleInterID.ToString()+
                 ",HMouldMaintainRuleInterID=" + HMouldMaintainRuleInterID.ToString() +
                 ",HMouldOWNER='" + HMouldOWNER + "'" +
+                ",HNowSupID="+HNowSupID.ToString()+
+                ",HNowSupTypeID="+HNowSupTypeID.ToString()+
                 ",HProdWeight=" + HProdWeight.ToString() +
                 " where HInterID=" + HInterID.ToString());
 
@@ -850,7 +885,7 @@
             DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
             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;
@@ -967,7 +1002,7 @@
             try
             {
                 //瀹℃牳鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;

--
Gitblit v1.9.1