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
{
@@ -602,6 +603,30 @@
        }

        /// <summary>
        /// 处理新增生产入库检验主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsQC_LastPieceCheckBillMain> getObjectByJson_ClsQC_LastPieceCheckBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_LastPieceCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增生产入库检验子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsQC_LastPieceCheckBillSub> getObjectByJson_ClsQC_LastPieceCheckBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_LastPieceCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增首件检验主表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -921,6 +946,7 @@
            List<Model.ClsSc_MouldMaintainPlanBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Item>>(jsonString);
            return list;
        }
        

        /// <summary>
        /// 处理新增不良原因表的json
@@ -934,6 +960,18 @@
            return list;
        }


        /// <summary>
        /// 处理新增白标基础配置表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_PackUnionBillBarCode_temp_Model> getObjectByJson_Sc_PackUnionBillBarCode_temp(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_PackUnionBillBarCode_temp_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_PackUnionBillBarCode_temp_Model>>(jsonString);
            return list;
        }
        /// <summary>
        /// 处理新增不良后果表的json
        /// </summary>
@@ -2332,6 +2370,55 @@
        }

        /// <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
        /// </summary>
        /// <param name="jsonString"></param>
@@ -2378,6 +2465,19 @@
            List<Model.ClsGy_MatePriceSup_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MatePriceSup_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理采购价目表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_PurPrice_Model> getObjectByJson_Gy_PurPrice(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_PurPrice_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PurPrice_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理采购价格表的json
        /// </summary>
@@ -4943,6 +5043,33 @@
            return list;
        }

        ///来料检验单 孙表
        ///ClsQC_POStockInCheckBillSub_ValueGrid
        public List<Model.ClsQC_POStockInCheckBillSub_ValueGrid> getObjectByJson_ClsQC_POStockInCheckBillSub_ValueGrid(string jsonString)
        {
            //jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_POStockInCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_POStockInCheckBillSub_ValueGrid>>(jsonString);
            return list;
        }

        ///生产入库检验单 孙表
        ///ClsQC_LastPieceCheckBillSub_ValueGrid
        public List<Model.ClsQC_LastPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_LastPieceCheckBillSub_ValueGrid(string jsonString)
        {
            //jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_LastPieceCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_LastPieceCheckBillSub_ValueGrid>>(jsonString);
            return list;
        }

        ///出厂检验单 孙表
        ///ClsQC_OutCompCheckBillSub_ValueGrid
        public List<Model.ClsQC_OutCompCheckBillSub_ValueGrid> getObjectByJson_ClsQC_OutCompCheckBillSub_ValueGrid(string jsonString)
        {
            //jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsQC_OutCompCheckBillSub_ValueGrid> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_OutCompCheckBillSub_ValueGrid>>(jsonString);
            return list;
        }

        ///首件检验单 孙表
        ///ClsQC_FirstPieceCheckBillSub_ValueGrid
        public List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_FirstPieceCheckBillSub_ValueGrid(string jsonString)
@@ -5042,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;
        }
    }
}