Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

yangle

2023-03-03 c2a9a460e38c7c196fe98a94e29e6330eac3626f

 WebAPI/ListModels.cs

@@ -493,7 +493,7 @@


        /// <summary>
        /// 处理新增模具维修子表的json
        /// 处理新增模具维修子表保养信息的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
@@ -501,6 +501,18 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_MouldRepairWorkBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具维修子表配件信息的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSb_MouldRepairWorkBillSub_Item> getObjectByJson_Gy_MouldRepairWorkBillSub_Item(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_MouldRepairWorkBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub_Item>>(jsonString);
            return list;
        }

@@ -712,6 +724,42 @@
        }

        /// <summary>
        /// 处理新增器具点检规程项目的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckRuleBillMain> getObjectByJson_Sc_MouldDotCheckRuleBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增器具点检规程 子表点检项目的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckRuleBillSub> getObjectByJson_Sc_MouldDotCheckRuleBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增器具点检规程 子表 配件的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> getObjectByJson_Sc_MouldDotCheckRuleBillSub_Item(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckRuleBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckRuleBillSub_Item>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具保养记录表子表配件项的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -809,7 +857,7 @@
        }

        /// <summary>
        /// 处理新增模具点检记录表子表的json
        /// 处理新增模具点检记录表子表 点检项目 的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
@@ -817,6 +865,18 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具点检记录表子表 配件信息 的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckBillSub_Item> getObjectByJson_Sc_MouldDotCheckBillSub_Item(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckBillSub_Item>>(jsonString);
            return list;
        }

@@ -843,6 +903,19 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckPlanBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具点检计划表 配件子表的json
        /// ClsSc_MouldDotCheckPlanBillSub
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> getObjectByJson_Sc_MouldDotCheckPlanBillSub_Item(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldDotCheckPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldDotCheckPlanBillSub_Item>>(jsonString);
            return list;
        }

@@ -1016,6 +1089,30 @@
        }

        /// <summary>
        /// 处理器具状态表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_MouldStatus_Model> getObjectByJson_Gy_MouldStatus(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_MouldStatus_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldStatus_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理设备状态表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_EquipStatus_Model> getObjectByJson_Gy_EquipStatus(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_EquipStatus_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_EquipStatus_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理单据类型表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -1026,7 +1123,19 @@
            List<Model.ClsXt_BillType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillType_Model>>(jsonString);
            return list;
        }
        

        /// <summary>
        /// 处理单据子类型表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsXt_BillSubType_Model> getObjectByJson_Xt_BillSubType(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXt_BillSubType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXt_BillSubType_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理收款条件表的json
        /// </summary>
@@ -1373,6 +1482,63 @@
            List<Model.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipDotCheckBillSub>>(jsonString);
            return list;
        }

        ///设备入库检验验收单 子表
        ///ClsSb_EquipStockInCheckBillSub
        public List<Model.ClsSb_EquipStockInCheckBillSub> getObjectByJson_ClsSb_EquipStockInCheckBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipStockInCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipStockInCheckBillSub>>(jsonString);
            return list;
        }


        ///设备入库检验验收单 主表
        ///ClsSb_EquipStockInCheckBillMain
        public List<Model.ClsSb_EquipStockInCheckBillMain> getObjectByJson_ClsSb_EquipStockInCheckBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipStockInCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipStockInCheckBillMain>>(jsonString);
            return list;
        }

        ///工序返工申请单 主表
        ///ClsSc_ProcExchWorkBackBillMain
        public List<Model.ClsSc_ProcExchWorkBackBillMain> getObjectByJson_ClsSc_ProcExchWorkBackBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcExchWorkBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchWorkBackBillMain>>(jsonString);
            return list;
        }

        ///工序返工申请单 子表
        ///ClsSb_EquipStockInCheckBillSub
        public List<Model.ClsSc_ProcExchWorkBackBillSub> getObjectByJson_ClsSc_ProcExchWorkBackBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_ProcExchWorkBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_ProcExchWorkBackBillSub>>(jsonString);
            return list;
        }

        ///设备投产检验验收单 子表
        ///ClsSb_EquipWorkBeforeCheckBillSub
        public List<Model.ClsSb_EquipWorkBeforeCheckBillSub> getObjectByJson_ClsSb_EquipWorkBeforeCheckBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipWorkBeforeCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipWorkBeforeCheckBillSub>>(jsonString);
            return list;
        }


        ///设备投产检验验收单 主表
        ///ClsSb_EquipWorkBeforeCheckBillMain
        public List<Model.ClsSb_EquipWorkBeforeCheckBillMain> getObjectByJson_ClsSb_EquipWorkBeforeCheckBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipWorkBeforeCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipWorkBeforeCheckBillMain>>(jsonString);
            return list;
        }


        /// <summary>
        /// 设备保养计划 主表
@@ -2032,6 +2198,18 @@
        }

        /// <summary>
        /// 用户工序关系信息表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.Gy_UserProcess> getObjectByJson_Gy_UserProcess(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.Gy_UserProcess> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Gy_UserProcess>>(jsonString);
            return list;
        }

        /// <summary>
        /// 用户-用户关系信息表的json
        /// </summary>
        /// <param name="jsonString"></param>