From f7c4ceeb654db44722c9362af3e9b70c9d231a3d Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 22 十月 2021 16:54:07 +0800
Subject: [PATCH] 0

---
 WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs |  206 +++++++++++++++++++++++++++++++++-----------------
 1 files changed, 135 insertions(+), 71 deletions(-)

diff --git a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
index ebc5ba3..a8c2e7b 100644
--- a/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
+++ b/WebAPI/Controllers/Sc_MouldRepairInBillListController - .cs
@@ -71,7 +71,7 @@
 
         public static DataSet Sc_CheckToolsRepairWorkBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairWorkBillList ", "h_v_Sc_CheckToolsRepairWorkBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairWorkBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsRepairWorkBillList");
         }
 
 
@@ -123,7 +123,7 @@
 
         public static DataSet Sc_CheckToolsDotCheckPlanBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckPlanBillList ", "h_v_Sc_CheckToolsDotCheckPlanBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsDotCheckPlanBillList");
         }
         #endregion
 
@@ -171,7 +171,7 @@
 
         public static DataSet Sc_CheckToolsMaintainBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainBillList ", "h_v_Sc_CheckToolsMaintainBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsMaintainBillList");
         }
         #endregion
 
@@ -280,7 +280,7 @@
 
         public static DataSet Sc_MouldDotCheckPlanBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList ", "h_v_Sc_MouldDotCheckPlanBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldDotCheckPlanBillList");
         }
         #endregion
 
@@ -328,7 +328,7 @@
 
         public static DataSet Sc_MouldDotCheckBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+" ", "h_v_Sc_MouldDotCheckBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldDotCheckBillList where 1=1 "+sWhere+ "order by 鏃ユ湡 desc", "h_v_Sc_MouldDotCheckBillList");
         }
         #endregion
 
@@ -377,7 +377,7 @@
 
         public static DataSet Sc_CheckToolsMaintainPlanBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainPlanBillList ", "h_v_Sc_CheckToolsMaintainPlanBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsMaintainPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsMaintainPlanBillList");
         }
         #endregion
 
@@ -426,7 +426,7 @@
 
         public static DataSet Sc_MouldMaintainPlanBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList ", "h_v_Sc_MouldMaintainPlanBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldMaintainPlanBillList order by 鏃ユ湡 desc", "h_v_Sc_MouldMaintainPlanBillList");
         }
         #endregion
 
@@ -573,7 +573,7 @@
 
         public static DataSet Sc_CheckToolsRepairCheckBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairCheckBillList ", "h_v_Sc_CheckToolsRepairCheckBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsRepairCheckBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsRepairCheckBillList");
         }
         #endregion
 
@@ -689,7 +689,7 @@
 
         public static DataSet Sc_CheckToolsConkBookBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsConkBookBillList ", "h_v_Sc_CheckToolsConkBookBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsConkBookBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsConkBookBillList");
         }
         #endregion
 
@@ -738,7 +738,7 @@
 
         public static DataSet Sc_CheckToolsDotCheckBillList_s(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckBillList ", "h_v_Sc_CheckToolsDotCheckBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_CheckToolsDotCheckBillList order by 鏃ユ湡 desc", "h_v_Sc_CheckToolsDotCheckBillList");
         }
         #endregion
 
@@ -787,7 +787,7 @@
 
         public static DataSet Sc_GetMoveStockBillList(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MoveStockBillList ", "h_v_IF_MoveStockBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MoveStockBillList order by 鏃ユ湡 desc", "h_v_IF_MoveStockBillList");
         }
         #endregion
 
@@ -835,7 +835,7 @@
 
         public static DataSet Sc_GetMateOutBillList(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList ", "h_v_IF_MateOutBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_MateOutBillList order by 鏃ユ湡 desc", "h_v_IF_MateOutBillList");
         }
         #endregion
 
@@ -884,7 +884,7 @@
 
         public static DataSet Sc_GetSellOutBillList(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList ", "h_v_IF_SellOutBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_SellOutBillList order by 鏃ユ湡 desc", "h_v_IF_SellOutBillList");
         }
         #endregion
 
@@ -933,7 +933,7 @@
 
         public static DataSet Sc_GetOtherOutBillList(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherOutBillList ", "h_v_Kf_OtherOutBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherOutBillList order by 鏃ユ湡 desc", "h_v_Kf_OtherOutBillList");
         }
         #endregion
 
@@ -1031,7 +1031,7 @@
 
         public static DataSet Sc_GetPOStockInBill(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList ", "h_v_IF_POStockInBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_POStockInBillList order by 鏃ユ湡 desc", "h_v_IF_POStockInBillList");
         }
         #endregion
 
@@ -1081,7 +1081,7 @@
 
         public static DataSet Sc_GetProductInBill(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList ", "h_v_IF_ProductInBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_IF_ProductInBillList order by 鏃ユ湡 desc", "h_v_IF_ProductInBillList");
         }
         #endregion
 
@@ -1130,7 +1130,7 @@
 
         public static DataSet Sc_GetOtherInBill(string sWhere)
         {
-            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherInBillList ", "h_v_Kf_OtherInBillList");
+            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Kf_OtherInBillList order by 鏃ユ湡 desc ", "h_v_Kf_OtherInBillList");
         }
         #endregion
 
@@ -3377,7 +3377,7 @@
                     ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
                                             HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
                                             璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
-                                            HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark
+                                            HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark,HStockOrgID
                                             FROM h_v_Sc_MouldScrapInHouseBillList"), "h_v_Sc_MouldScrapInHouseBillList");
 
                     objJsonResult.code = "0";
@@ -3392,7 +3392,7 @@
                     string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
                                             HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
                                             璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炴敹鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鏀舵枡浠撳簱浠ｇ爜 HWHCode, 鏀舵枡浠撳簱鍚嶇О HWHName,
-                                            HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark
+                                            HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark,HStockOrgID
                                             FROM h_v_Sc_MouldScrapInHouseBillList where 1 = 1 ");
                     string sql = sql1 + sqlWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldScrapInHouseBillList");
@@ -3422,7 +3422,7 @@
         /// <returns></returns>
         [Route("Sc_MouldScrapInHouseBill/SaveGetMouldScrapInHouseBillList")]
         [HttpPost]
-        public object SaveGetMouldScrapInHouseBillList([FromBody] JObject msg)
+        public object fSaveGetMouldScrapInHouseBillList([FromBody] JObject msg)
         {
             var _value = msg["msg"].ToString();
             string msg1 = _value.ToString();
@@ -3430,12 +3430,23 @@
             string msg2 = sArray[0].ToString();
             string msg3 = sArray[1].ToString();
             string refSav = sArray[2].ToString();
+            string msg4 = sArray[3].ToString();
 
             string UserName = "";
             string s = "";
             ListModels oListModels = new ListModels();
             try
             {
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapRequestBill_Edit", 1, true, msg4))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 DLL.ClsSc_MouldScrapInBill oBill = new DLL.ClsSc_MouldScrapInBill();
                 List<Models.ClsSc_MouldStockBillMain> lsmain = new List<Models.ClsSc_MouldStockBillMain>();
                 msg2 = msg2.Replace("\\", "");
@@ -3745,12 +3756,21 @@
 
         [Route("Sc_MouldScrapOutHouseBill/GetMouldScrapOutHouseBill")]
         [HttpGet]
-        public object GetMouldScrapOutHouseBill(string sWhere)
+        public object GetMouldScrapOutHouseBill(string sWhere,string user, string Organization)
         {
             try
             {
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBillList", 1, true, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
-                ds = Sc_GetMouldScrapOutHouseBill(sWhere);
+                ds = Sc_GetMouldScrapOutHouseBill(sWhere,Organization);
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -3767,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");
             }
@@ -3814,7 +3834,7 @@
                     ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
                                                   HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, 鎹㈢畻鐜� HSecUnitRate, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
                                                   璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炲彂鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鍙戣揣浠撳簱浠ｇ爜 HWHCode, 鍙戣揣浠撳簱鍚嶇О HWHName,
-                                                  HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark FROM h_v_Sc_MouldScrapOutHouseBillList"), "h_v_Sc_MouldScrapOutHouseBillList");
+                                                  HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldScrapOutHouseBillList"), "h_v_Sc_MouldScrapOutHouseBillList");
 
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
@@ -3828,7 +3848,7 @@
                     string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,HPropertyID,杈呭姪灞炴�т唬鐮� HPropertyCode,杈呭姪灞炴�у悕绉� HPropertyName,
                                                   HSecUnitID, 杈呭姪璁￠噺鍗曚綅浠ｇ爜 HSecUnitCode, 杈呭姪璁￠噺鍗曚綅鍚嶇О HSecUnitName, 鎹㈢畻鐜� HSecUnitRate, HUnitID, 璁￠噺鍗曚綅浠ｇ爜 HUnitCode, 璁￠噺鍗曚綅鍚嶇О HUnitName, 鎵规 HBatchNo,
                                                   璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 浣跨敤瀵垮懡 HUseLife, 瀹炲彂鏁伴噺 HQty, 鍗曚环 HPrice, 閲戦 HMoney, HWHID, 鍙戣揣浠撳簱浠ｇ爜 HWHCode, 鍙戣揣浠撳簱鍚嶇О HWHName,
-                                                  HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark FROM h_v_Sc_MouldScrapOutHouseBillList where 1 = 1 ");
+                                                  HSPID, 浠撲綅浠ｇ爜 HSPCode, 浠撲綅鍚嶇О HSPName, 澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldScrapOutHouseBillList where 1 = 1 ");
                     string sql = sql1 + sqlWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldScrapOutHouseBillList");
 
@@ -3864,12 +3884,22 @@
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
             string msg3 = sArray[1].ToString();
-
+            string msg4 = sArray[2].ToString();
 
             string UserName = "";
             ListModels oListModels = new ListModels();
             try
             {
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Edit", 1, true, msg4))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 DLL.ClsSc_MouldScrapOutBill oBill = new DLL.ClsSc_MouldScrapOutBill();
                 List<Model.ClsSc_MouldStockBillMain> lsmain = new List<Model.ClsSc_MouldStockBillMain>();
                 msg2 = msg2.Replace("\\", "");
@@ -3991,17 +4021,17 @@
         /// <returns></returns>
         [Route("Sc_MouldScrapOutHouseBill/DeltetMouldScrapOutHouseBill")]
         [HttpGet]
-        public object DeltetMouldScrapOutHouseBill(string HInterID)
+        public object DeltetMouldScrapOutHouseBill(string HInterID,string user)
         {
             //缂栬緫鏉冮檺
-            //if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
-            //{
-            //    objJsonResult.code = "0";
-            //    objJsonResult.count = 0;
-            //    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
-            //    objJsonResult.data = null;
-            //    return objJsonResult;
-            //}
+            if (!DBUtility.ClsPub.Security_Log("Sc_MouldScrapOutBill_Delete", 1, true, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
 
 
             Int64 lngBillKey = 0;
@@ -4211,12 +4241,20 @@
 
         [Route("Sc_MouldProdBackBill/GetMouldProdBackBill")]
         [HttpGet]
-        public object GetMouldProdBackBill(string sWhere)
+        public object GetMouldProdBackBill(string sWhere,string user, string Organization)
         {
             try
             {
+                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBillList", 1, true, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
-                ds = Sc_GetMouldProdBackBill(sWhere);
+                ds = Sc_GetMouldProdBackBill(sWhere,Organization);
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4233,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");
             }
@@ -4281,7 +4319,7 @@
                     ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
                                                 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty, 
                                                 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID, 
-                                                浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdBackBillList"), "h_v_Sc_MouldProdBackBillList");
+                                                浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldProdBackBillList"), "h_v_Sc_MouldProdBackBillList");
 
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
@@ -4295,7 +4333,7 @@
                     string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
                                                 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty, 
                                                 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID, 
-                                                浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdBackBillList where 1 = 1 ");
+                                                浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldProdBackBillList where 1 = 1 ");
                     string sql = sql1 + sqlWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdBackBillList");
 
@@ -4331,12 +4369,21 @@
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
             string msg3 = sArray[1].ToString();
-
+            string msg4 = sArray[2].ToString();
 
             string UserName = "";
             ListModels oListModels = new ListModels();
             try
             {
+                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Edit", 1, true, msg4))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 DLL.ClsSc_MouldProdBackBill oBill = new DLL.ClsSc_MouldProdBackBill();
                 List<Model.ClsSc_MouldProdBackBillMain> lsmain = new List<Model.ClsSc_MouldProdBackBillMain>();
                 msg2 = msg2.Replace("\\", "");
@@ -4458,17 +4505,17 @@
         /// <returns></returns>
         [Route("Sc_MouldProdBackBill/DeltetMouldProdBackBill")]
         [HttpGet]
-        public object DeltetMouldProdBackBill(string HInterID)
+        public object DeltetMouldProdBackBill(string HInterID,string user)
         {
             //缂栬緫鏉冮檺
-            //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
-            //{
-            //    objJsonResult.code = "0";
-            //    objJsonResult.count = 0;
-            //    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
-            //    objJsonResult.data = null;
-            //    return objJsonResult;
-            //}
+            if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
 
 
             Int64 lngBillKey = 0;
@@ -4539,12 +4586,20 @@
 
         [Route("Sc_MouldProdOutBill/GetMouldProdOutBill")]
         [HttpGet]
-        public object GetMouldProdOutBill(string sWhere)
+        public object GetMouldProdOutBill(string sWhere, string user,string Organization)
         {
             try
             {
+                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBillList", 1, true, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
-                ds = Sc_GetMouldProdOutBill(sWhere);
+                ds = Sc_GetMouldProdOutBill(sWhere,Organization);
                 objJsonResult.code = "1";
                 objJsonResult.count = 1;
                 objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -4561,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");
             }
@@ -4609,7 +4664,7 @@
                     ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
                                                 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty, 
                                                 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID, 
-                                                浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdOutHouseBillList"), "h_v_Sc_MouldProdOutHouseBillList");
+                                                浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldProdOutHouseBillList"), "h_v_Sc_MouldProdOutHouseBillList");
 
                     objJsonResult.code = "0";
                     objJsonResult.count = 1;
@@ -4623,7 +4678,7 @@
                     string sql1 = string.Format(@"SELECT HMaterID,妯″叿浠ｇ爜 HMaterCode,妯″叿鍚嶇О HMaterName,瑙勬牸鍨嬪彿 HMaterSpec,鎵规 HBatchNo,
                                                 璁捐瀵垮懡 HDesignLife, 鍓╀綑瀵垮懡 HLeaveLife, 绱Н浣跨敤瀵垮懡 HUseLife, 搴斿彂鏁伴噺 HQtyMust, 瀹炲彂鏁伴噺 HQty, 
                                                 鍗曚环 HPrice, 閲戦 HMoney,HWHSonID HWHID, 鍙戞枡浠撳簱浠ｇ爜 HWHCode, 鍙戞枡浠撳簱 HWHName,HSPID, 
-                                                浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark FROM h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ");
+                                                浠撲綅浠ｇ爜 HSPCode, 浠撲綅 HSPName,琛ㄤ綋澶囨敞 HRemark,HStockOrgID FROM h_v_Sc_MouldProdOutHouseBillList where 1 = 1 ");
                     string sql = sql1 + sqlWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldProdOutHouseBillList");
 
@@ -4659,12 +4714,21 @@
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
             string msg3 = sArray[1].ToString();
+            string msg4= sArray[2].ToString();
 
 
             string UserName = "";
             ListModels oListModels = new ListModels();
             try
             {
+                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Edit", 1, true, msg4))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
                 DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
                 List<Model.ClsSc_MouldProdOutBillMain> lsmain = new List<Model.ClsSc_MouldProdOutBillMain>();
                 msg2 = msg2.Replace("\\", "");
@@ -4786,17 +4850,17 @@
         /// <returns></returns>
         [Route("Sc_MouldProdOutBill/DeltetMouldProdOutBill")]
         [HttpGet]
-        public object DeltetMouldProdOutBill(string HInterID)
+        public object DeltetMouldProdOutBill(string HInterID, string user)
         {
-            //缂栬緫鏉冮檺
-            //if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdBackBill_Delete", 1, true, DBUtility.ClsPub.CurUserName))
-            //{
-            //    objJsonResult.code = "0";
-            //    objJsonResult.count = 0;
-            //    objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
-            //    objJsonResult.data = null;
-            //    return objJsonResult;
-            //}
+            //鍒犻櫎鏉冮檺
+            if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdOutBill_Delete", 1, true, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
 
 
             Int64 lngBillKey = 0;

--
Gitblit v1.9.1