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

llj

昨天 a91fdba94705dd25cecccc7a4a5dcc2b3f2c09a6

 WebAPI/ListModels.cs

@@ -699,7 +699,17 @@
            return list;
        }


        /// <summary>
        /// 处理检验仪器记录单的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_QCVerificationBillMain> getObjectByJson_Gy_QCVerificationBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_QCVerificationBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 处理新增模具维修子表保养信息的json
        /// </summary>
@@ -723,6 +733,18 @@
            List<Model.ClsSb_MouldRepairWorkBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_MouldRepairWorkBillSub_Item>>(jsonString);
            return list;
        }
        /// <summary>
        /// 处理新增模具维修子表配件信息的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_QCVerificationBillSub> getObjectByJson_Gy_QCVerificationBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_QCVerificationBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillSub>>(jsonString);
            return list;
        }
        

        /// <summary>
        /// 处理新增模具维修验收单主表的json
@@ -1223,6 +1245,19 @@
            List<Model.ClsGy_ProjectMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoney_Model>>(jsonString);
            return list;
        }

        /// <summary>  
        /// 处理新增项目费用表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_ItemMoney_Model> getObjectByJson_Gy_ItemMoney(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_ItemMoney_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ItemMoney_Model>>(jsonString);
            return list;
        }


        /// <summary>  
        /// 处理新增项目费用分类表的json
@@ -2370,6 +2405,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>
@@ -2416,6 +2500,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>
@@ -3335,9 +3432,30 @@
            List<Model.ClsGy_MaterPreventErrMouldBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MaterPreventErrMouldBillMain>>(jsonString);
            return list;
        }


        /// <summary>
        /// 处理承运合同清单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsCg_ContractTransportBillMain> getObjectByJson_ContractTransportBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCg_ContractTransportBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_ContractTransportBillMain>>(jsonString);
            return list;
        }
        /// <summary>ClsCg_ContractTransportBillSub
        /// 处理新增承运合同子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsCg_ContractTransportBillSub> getObjectByJson_Cg_ContractTransportBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCg_ContractTransportBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_ContractTransportBillSub>>(jsonString);
            return list;
        }

        /// <summary>ClsCg_ContractTransportBillSub
        /// 处理新增产品犯错验证清单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -5090,6 +5208,13 @@
            return list;
        }

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

        ///作业指导书 主表 
        ///ClsGy_SOPBillMain
        public List<Model.ClsGy_SOPBillMain> getObjectByJson_Gy_SOPBillMain(string jsonString)
@@ -5119,5 +5244,42 @@
            List<ClsWW_EntrustOrderBillMain_1> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsWW_EntrustOrderBillMain_1>>(jsonString);
            return list;
        }

        /// <summary>
        /// 运单申请 主表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<ClsCg_OrderTransportBill_Model> getObjectByJson_Cg_OrderTransportBill(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<ClsCg_OrderTransportBill_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBill_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 运单申请 子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<ClsCg_OrderTransportBillSub_Model> getObjectByJson_Cg_OrderTransportBill_Sub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<ClsCg_OrderTransportBillSub_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 运单申请 子表 Money
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<ClsCg_OrderTransportBillSub_Money_Model> getObjectByJson_Cg_OrderTransportBill_SubMoney(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<ClsCg_OrderTransportBillSub_Money_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsCg_OrderTransportBillSub_Money_Model>>(jsonString);
            return list;
        }

    }
}