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

yusijie

2023-10-13 ed36ed67fd9ff47fd762192c3fc8cf4d99a76294

 WebAPI/ListModels.cs

@@ -168,6 +168,42 @@
        }

        /// <summary>
        /// 销售出库反序列化子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsKf_SellOutBillSub> getSellOutBillSubByJson(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_SellOutBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_SellOutBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 退货通知单反序列化
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsXs_SeOutStockBackBillMain> getSeOutStockBackBillMainByJson(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXs_SeOutStockBackBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SeOutStockBackBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 退货通知单反序列化子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsXs_SeOutStockBackBillSub> getSeOutStockBackBillSubByJson(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXs_SeOutStockBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_SeOutStockBackBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 销售退库反序列化
        /// </summary>
        /// <param name="jsonString"></param>
@@ -2591,6 +2627,59 @@
            return list;
        }

        #region 客诉处理单
        /// <summary>
        /// 客诉处理单主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsCrm_CustomerAppealBillMain> getObjectByJson_Crm_CustomerAppealBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCrm_CustomerAppealBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCrm_CustomerAppealBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 客诉处理单子表json2
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsCrm_CustomerAppealBillSub> getObjectByJson_Crm_CustomerAppealBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCrm_CustomerAppealBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCrm_CustomerAppealBillSub>>(jsonString);
            return list;
        }
        #endregion


        #region 工作周计划
        /// <summary>
        /// 工作周计划主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsPM_WorkTaskWeekBillMain> getObjectByJson_PM_WorkTaskWeekBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsPM_WorkTaskWeekBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkTaskWeekBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 工作周计划子表json2
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsPM_WorkTaskWeekBillSub> getObjectByJson_PM_WorkTaskWeekBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsPM_WorkTaskWeekBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkTaskWeekBillSub>>(jsonString);
            return list;
        }
        #endregion 


        #region 工资计算单 集体
        public List<Models.ClsPay_GroupBalBillMain> getObjectByJson_Pay_GroupBalBillMain(string jsonString)
        {