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

chenhaozhe

2025-10-22 75a4453d1c141c6ac434d1bd13927dc71cc9fa37

 WebAPI/ListModels.cs

@@ -9,6 +9,7 @@
using Model;
using System.Data;
using System.Text.RegularExpressions;
using WebAPI.Models;

namespace WebAPI
{
@@ -2367,6 +2368,55 @@
            List<Model.ClsGy_Operator_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Operator_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理业务组表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_OperatorGroup> getObjectByJson_Gy_OperatorGroup(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_OperatorGroup> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_OperatorGroup>>(jsonString);
            return list;
        }

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

        /// <summary>
        /// 处理辅助资料类别的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_AssistantData> getObjectByJson_Gy_AssistantData(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_AssistantData> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_AssistantData>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理辅助资料的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_AssistantDataEntry> getObjectByJson_Gy_AssistantDataEntry(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_AssistantDataEntry> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_AssistantDataEntry>>(jsonString);
            return list;
        }


        /// <summary>
        /// 处理作业表的json
@@ -5119,10 +5169,17 @@
            List<Model.ClsGy_SOPBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_SOPBillSub>>(jsonString);
            return list;
        }

        
        public static implicit operator ListModels(DataTable v)
        {
            throw new NotImplementedException();
        }

        public List<ClsWW_EntrustOrderBillMain_1> getObjectByJson_WW_EntrustOrderBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<ClsWW_EntrustOrderBillMain_1> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsWW_EntrustOrderBillMain_1>>(jsonString);
            return list;
        }
    }
}