zzr99
2022-02-10 dac1d793ad118eebf9048588a356ae0ea8a3aa95
WebAPI/Controllers/基础资料/工资基础资料/Gy_ProcPriceController.cs
@@ -21,10 +21,20 @@
        #region 杩斿洖宸ュ簭宸ヤ环鍒楄〃
        [Route("Gy_ProcPrice/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string user)
        {
            try
            {
                //鏌ョ湅鏉冮檺
                if (!DBUtility.ClsPub.Security_Log("Gy_ProcPriceList", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                ds = oCN.RunProcReturn("select * from h_v_Gy_ProcPriceList where 1 = 1 " + sWhere, "h_v_Gy_ProcPriceList");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
@@ -71,9 +81,19 @@
            string msg2 = sArray[0].ToString();
            string msg3 = sArray[1].ToString();
            string OperationType = sArray[2].ToString().Trim();
            string msg4 = sArray[3].ToString();
            bool bResult;
            try
            {
                //鏌ョ湅鏉冮檺
                if (!DBUtility.ClsPub.Security_Log("Gy_ProcPriceList_Edit", 1, false, msg4))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                msg2 = "[" + msg2.ToString() + "]";
                List<ClsGy_ProcPrice> mainList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ProcPrice>>(msg2);
                List<ClsGy_ProcPrice> subList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsGy_ProcPrice>>(msg3);
@@ -157,7 +177,7 @@
            try
            {
                ds = oCN.RunProcReturn("select " +
                    "a.HItemID,a.HDeptID,b.HName HDeptName" +
                    "a.HItemID,ltrim(a.HMaterID)+'-'+ltrim(a.HProcID) 宸ュ簭宸ヤ环璧勬枡浠g爜,a.HDeptID,b.HName HDeptName" +
                    ",a.HMaterID HMaterIDCol,c.HNumber HMaterNumberCol,c.HName HMaterNameCol,c.HModel HMaterModelCol" +
                    ",a.HProcID HProcIDCol,d.HNumber HProcNumberCol,d.HName HProcNameCol" +
                    ",a.HSourceID HSourceIDCol,e.HNumber HSourceNumberCol,e.HName HSourceNameCol" +
@@ -169,7 +189,7 @@
                    " left join Gy_Department b on a.HDeptID = b.HItemID " +
                    " left join Gy_Material c on a.HMaterID = c.HItemID " +
                    " left join Gy_Process d on a.HProcID = d.HItemID " +
                    " left join Gy_Source e on a.HSourceID = e.HItemID where HItemID = " + HItemID, "Gy_ProcPrice");
                    " left join Gy_Source e on a.HSourceID = e.HItemID where a.HItemID = " + HItemID, "Gy_ProcPrice");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";