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

wtt

2024-08-07 c2ef1e65edb97ddbd00cc130e9f4dd9d47e0252d

 WebAPI/ListModels.cs

@@ -1122,7 +1122,7 @@
            List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString);
            return list;
        }

        
        /// <summary>  
        /// 处理新增防错装置表的json
        /// </summary>
@@ -1134,6 +1134,30 @@
            List<Model.ClsGy_PreventErrMould_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PreventErrMould_Model>>(jsonString);
            return list;
        }
        /// <summary>  
        /// 处理新增休息日表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_RestDay_Model> getObjectByJson_Gy_RestDay(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_RestDay_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RestDay_Model>>(jsonString);
            return list;
        }

        /// <summary>  
        /// 处理新增休息日表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_RestDay_Model> getObjectByJson_SumGy_RestDay(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_RestDay_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RestDay_Model>>(jsonString);
            return list;
        }


        /// <summary>  
        /// 处理新增保养级别表的json
@@ -1302,6 +1326,30 @@
        }

        /// <summary>
        /// 处理人员技能考核记录单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsHR_EmployeeSkillExamBillMain> getObjectByJson_HR_EmployeeSkillExamBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsHR_EmployeeSkillExamBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_EmployeeSkillExamBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理人员技能考核记录单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsHR_EmployeeSkillExamBillSub> getObjectByJson_HR_EmployeeSkillExamBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsHR_EmployeeSkillExamBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsHR_EmployeeSkillExamBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理安灯逐级呼吸规则主表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -1324,6 +1372,20 @@
            List<Model.ClsOA_AndengFlowRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsOA_AndengFlowRuleBillSub>>(jsonString);
            return list;
        }


        /// <summary>
        /// 处理设备维修签到单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSb_EquipRepairSignBillMain> getObjectByJson_Sb_EquipRepairSignBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipRepairSignBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipRepairSignBillMain>>(jsonString);
            return list;
        }


        /// <summary>
        /// 处理新员工技能清单主表的json
@@ -3017,6 +3079,7 @@
            return list;
        }


        /// <summary>
        /// 处理新增生产完工单的json
        /// </summary>
@@ -3294,6 +3357,18 @@
        }

        /// <summary>
        /// 报工平台开工单子表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> getObjectByJson_Sc_MESBeginWorkBillSub_RelationBill(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillSub_RelationBill>>(jsonString);
            return list;
        }

        /// <summary>
        /// 报工平台返工单主表json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -3326,6 +3401,41 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MaterToSourceBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MaterToSourceBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 报工平台检验取样主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsQC_TakeSampleCheckBillMain> getObjectByJson_QC_TakeSampleCheckBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_TakeSampleCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_TakeSampleCheckBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 报工平台检验还样主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsQC_BackSampleCheckBillMain> getObjectByJson_QC_BackSampleCheckBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_BackSampleCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_BackSampleCheckBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 报工平台检验还样主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsQC_BackSampleCheckBillSub> getObjectByJson_QC_TakeSampleCheckBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_BackSampleCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_BackSampleCheckBillSub>>(jsonString);
            return list;
        }

@@ -4148,7 +4258,7 @@
            List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid>>(jsonString);
            return list;
        }

        
        ///库存检验单 孙表
        ///ClsQC_StockCheckBillSub_ValueGrid
        public List<Model.ClsQC_StockCheckBillSub_ValueGrid> getObjectByJson_ClsQC_StockCheckBillSub_ValueGrid(string jsonString)
@@ -4158,6 +4268,15 @@
            return list;
        }

        ///巡检单2 孙表
        ///ClsQC_PatrolProcCheckOtherBillSub_ValueGrid
        public List<Model.ClsQC_PatrolProcCheckOtherBillSub_ValueGrid> getObjectByJson_ClsQC_PatrolProcCheckOtherBillSub_ValueGrid(string jsonString)
        {
            //jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_PatrolProcCheckOtherBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_PatrolProcCheckOtherBillSub_ValueGrid>>(jsonString);
            return list;
        }

        ///车间自检单 孙表
        ///ClsQC_WorkSelfCheckBillSub_ValueGrid
        public List<Model.ClsQC_WorkSelfCheckBillSub_ValueGrid> getObjectByJson_ClsQC_WorkSelfCheckBillSub_ValueGrid(string jsonString)