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

ch

2022-12-04 a71373599d6bddfcf3a65a288be80cbf2b1f9e30

 WebAPI/ListModels.cs

@@ -109,6 +109,17 @@
            return list;
        }
        /// <summary>
        /// 生产补料反序列化
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsKf_MateReplenishOutBillMain> getMateReplenishOutBillMainByJson(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_MateReplenishOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_MateReplenishOutBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 委外出库反序列化
        /// </summary>
        /// <param name="jsonString"></param>
@@ -570,6 +581,18 @@
        }

        /// <summary>
        /// 处理新增出站汇报单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_StationOutBillMain> getObjectByJson_Sc_StationOutBillMain(string jsonString)
        {
            //jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_StationOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_StationOutBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具保养计划单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -822,6 +845,90 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString);
            return list;
        }

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

        /// <summary>
        /// 处理付款条件表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_PaymentCondition_Model> getObjectByJson_Gy_PaymentCondition(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_PaymentCondition_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PaymentCondition_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理税率表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_TaxRate_Model> getObjectByJson_Gy_TaxRate(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_TaxRate_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_TaxRate_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理收款条件表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_RecCondition_Model> getObjectByJson_Gy_RecCondition(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_RecCondition_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_RecCondition_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理供货方联系人表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_SupplierContact_Model> getObjectByJson_Gy_SupplierContact(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_SupplierContact_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SupplierContact_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理收货方联系人表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_COMMONCONTACT_Model> getObjectByJson_Gy_COMMONCONTACT(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_COMMONCONTACT_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_COMMONCONTACT_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增审核项目的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.Xt_CheckItem> getObjectByJson_Xt_CheckItem(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.Xt_CheckItem> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.Xt_CheckItem>>(jsonString);
            return list;
        }

@@ -1782,6 +1889,42 @@
        }

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

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

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

        /// <summary>
        /// 用户组织关系信息表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -1830,6 +1973,18 @@
        }

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

        /// <summary>
        /// 公告列表主表的json
        /// </summary>
        /// <param name="jsonString"></param>