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

jingh

2021-11-18 c9b9cff93130a51deac36c49372ab0d3f5b5b5ff

 WebAPI/ListModels.cs

@@ -547,6 +547,18 @@
        }

        /// <summary>
        /// 处理新增故障原因表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_ConkReason_Model> getObjectByJson_Gy_ConkReason(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_ConkReason_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ConkReason_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具保养记录表主表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -1673,5 +1685,31 @@
            List<Models.UserPower> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.UserPower>>(jsonString);
            return list;
        }


        /// <summary>
        /// 
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsKf_MateOutBillMain> getObjectByJson_Kf_ICStockBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsKf_MateOutBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsKf_MateOutBillMain>>(jsonString);
            return list;
        }


        /// <summary>
        /// 
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsKf_MateOutBillSub> getObjectByJson_Kf_MateOutBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsKf_MateOutBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsKf_MateOutBillSub>>(jsonString);
            return list;
        }
    }
}