智云MES后端API代码
parent: 42ad330d | 补丁 | 提交 | ignore whitespace
yusijie
2022-09-21 ed80467e957a5ae62f2e7a4df1e794a24eb36af3 
LAYUI列表列名改为动态加载模式（ 器具保养规程单维护，器具寿命调整单维护，器具保养记录单维护，器具点检记录单维护，器具故障登记单维护，器具维修记录单维护，设备点检规程单维护，设备保养规程单维护，设备保养记录单维护，设备点检记录单维护，设备故障登记单维护，设备维修记录单维护，班组职员清单维护 ）
8个文件已修改
164 ■■■■■ 已修改文件
WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_MouldRepairInBillListController.cs 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Gy_GroupEmpBillController.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Controllers/MJGL/Sc_MouldMaintainRuleBillController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using System;


using System.Collections.Generic;


using System.Data;


@@ -20,6 +21,14 @@


        public DAL.ClsSc_MouldMaintainRuleBill BillNew = new DAL.ClsSc_MouldMaintainRuleBill();   //对应单据类


        public DAL.ClsSc_MouldMaintainRuleBill BillOld = new DAL.ClsSc_MouldMaintainRuleBill();   //对应单据类






        //public class HlpBill


        //{


        //    public int HSouceInterID = 0;


        //    public int HSourceEntryID = 0;


        //    public int Type = 0;


        //    public string user { get; set; }


        //}


        #region å™¨å…·ä¿å…»è§„程单列表


        [Route("Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList")]


        [HttpGet]


@@ -27,6 +36,9 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                //反序列化传递的值


                //HlpBill com = JsonConvert.DeserializeObject<HlpBill>(sWhere.ToString());


                //编辑权限


                if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainRuleBillList", 1, false, user))


                {


@@ -48,12 +60,21 @@


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldMaintainRuleBillList");


                }




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }


                


                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


                //}


                //else




 WebAPI/Controllers/SBGL/Sb_EquipDotCheckBillController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using Pub_Class;


using System;


using System.Collections.Generic;


@@ -28,6 +29,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -46,13 +48,20 @@


                    string sql = sql1 + sWhere + " order by hmainid desc";


                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckBillList");


                }




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }


                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


                //}


                //else




 WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using System;


using System.Collections.Generic;


using System.Data;


@@ -27,6 +28,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sb_EquipDotCheckRuleBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -47,12 +49,20 @@


                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList");


                }




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }


                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


                //}


                //else




 WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using Pub_Class;


using System;


using System.Collections.Generic;


@@ -29,6 +30,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -48,12 +50,21 @@


                    ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintain");


                }




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


                //}


                //else




 WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using System;


using System.Collections.Generic;


using System.Data;


@@ -26,6 +27,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sb_EquipMaintainRuleBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -46,12 +48,20 @@


                    ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleList");


                }




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }


                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


                //}


                //else




 WebAPI/Controllers/Sb_CheckEqpRepairWorkBillController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using Pub_Class;


using System;


using System.Collections.Generic;


@@ -35,6 +36,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sb_EquipRepairWorkBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -46,10 +48,19 @@




                ds = Sb_EquipRepairWorkBill_s(sWhere);




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "返回记录成功！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


            }


            catch (Exception ex)


@@ -151,6 +162,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sb_EquipConkBookBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -162,10 +174,19 @@




                ds = Sb_EqpConkBookBillList_s(sWhere);




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "返回记录成功！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;




            }




 WebAPI/Controllers/Sc_MouldRepairInBillListController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using Pub_Class;


using System;


using System.Collections.Generic;


@@ -188,6 +189,8 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();




                if (!DBUtility.ClsPub.Security_Log("Sc_MouldMaintainBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -199,12 +202,20 @@




                ds = Sc_MouldMaintainBillList_s(sWhere);




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }


                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


                //}


                //else


@@ -315,6 +326,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sc_MouldDotCheckBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -325,12 +337,22 @@


                }


                ds = Sc_MouldDotCheckBillList_s(sWhere);




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;




                return objJsonResult;


                //}


                //else


@@ -479,6 +501,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sc_MouldConkBookBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -490,10 +513,19 @@




                ds = Sc_MouldConkBookBillList_s(sWhere);




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


            }


            catch (Exception ex)


@@ -654,6 +686,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Sb_MouldRepairWorkBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -665,12 +698,21 @@




                ds = Sc_MouldRepairWorkBillList_s(sWhere);




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                //if (ds.Tables[0].Rows.Count != 0 || ds != null)


                //{


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "Sucess！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


                //}


                //else


@@ -5544,6 +5586,8 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();




                if (!DBUtility.ClsPub.Security_Log("Sc_MouldLifeChangeBillList", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -5555,10 +5599,19 @@




                ds = Sc_GetMouldLifeChangeBill(sWhere);




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "返回记录成功！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


            }


            catch (Exception ex)




 WebAPI/Controllers/¹¤×ʹÜÀí/Gy_GroupEmpBillController.cs


@@ -1,4 +1,5 @@


using Newtonsoft.Json.Linq;


using Newtonsoft.Json;


using Newtonsoft.Json.Linq;


using Pub_Class;


using System;


using System.Collections;


@@ -32,6 +33,7 @@


        {


            try


            {


                List<object> columnNameList = new List<object>();


                if (!DBUtility.ClsPub.Security_Log("Gy_Group", 1, false, user))


                {


                    objJsonResult.code = "0";


@@ -43,10 +45,19 @@




                ds = Sc_GetGroupEmpBill(sWhere);




                //添加列名


                foreach (DataColumn col in ds.Tables[0].Columns)


                {


                    Type dataType = col.DataType;


                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";


                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名


                }




                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "返回记录成功！";


                objJsonResult.data = ds.Tables[0];


                objJsonResult.list = columnNameList;


                return objJsonResult;


            }


            catch (Exception ex)