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

chenhaozhe

4 天以前 291fdb29daf239a13fcfb3f5e08a2f5bf9167534

 WebAPI/ListModels.cs

@@ -700,7 +700,7 @@
        }

        /// <summary>
        /// 处理检验仪器记录单的json
        /// 处理检验仪器记录单的json 
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
@@ -708,6 +708,28 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_QCVerificationBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 处理检验仪器记录单的json ClsSc_EmployeeSignInNoteBill
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_EmployeeSignInNoteBill> getObjectByJson_Sc_EmployeeSignInNoteBill(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_EmployeeSignInNoteBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_EmployeeSignInNoteBill>>(jsonString);
            return list;
        }
        /// <summary>
        /// 处理运单json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsWL_YayBillMainBillMain> getObjectByJson_WL_YayBillMainMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsWL_YayBillMainBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWL_YayBillMainBillMain>>(jsonString);
            return list;
        }
        /// <summary>
@@ -742,6 +764,24 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_QCVerificationBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_QCVerificationBillSub>>(jsonString);
            return list;
        }
        /// <summary>
        /// 处理新增模具维修子表配件信息的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_EmployeeSignInNoteBillSub> getObjectByJson_Sc_EmployeeSignInNoteBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_EmployeeSignInNoteBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_EmployeeSignInNoteBillSub>>(jsonString);
            return list;
        }

        public List<Model.ClsWL_YayBillMainBillSub> getObjectByJson_WL_YayBillMainBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsWL_YayBillMainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsWL_YayBillMainBillSub>>(jsonString);
            return list;
        }
        
@@ -1951,6 +1991,30 @@
            return list;
        }

        /// <summary>
        /// 处理成本费用单json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsCB_ItemMoneyBillMain_1> getObjectByJson_CB_ItemMoneyBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCB_ItemMoneyBillMain_1> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCB_ItemMoneyBillMain_1>>(jsonString);
            return list;
        }


        /// <summary>
        /// 处理新增其他应收单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsCB_ItemMoneyBillSub_1> getObjectByJson_CB_ItemMoneyBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCB_ItemMoneyBillSub_1> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCB_ItemMoneyBillSub_1>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增其他应付单表的json
@@ -1973,6 +2037,42 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsYF_PayMentOtherBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsYF_PayMentOtherBillSub>>(jsonString);
            return list;
        }
        /// <summary>
        /// 处理新增结算应付单表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsPay_WayBillPaymentBillMain> getObjectByJson_Pay_WayBillPaymentBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsPay_WayBillPaymentBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_WayBillPaymentBillMain>>(jsonString);
            return list;
        }
        public List<Model.ClsCB_ChangeMoneyBillMain> getObjectByJson_CB_ChangeMoneyBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCB_ChangeMoneyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCB_ChangeMoneyBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增结算子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsPay_WayBillPaymentBillSub> getObjectByJson_Pay_WayBillPaymentBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsPay_WayBillPaymentBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPay_WayBillPaymentBillSub>>(jsonString);
            return list;
        }

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

@@ -4342,10 +4442,44 @@


        /// <summary>
        /// 将JSON字符串转换为质检申请单子表对象列表
        /// </summary>
        /// <param name="jsonString">JSON字符串</param>
        /// <returns>质检申请单子表对象列表</returns>
        public List<Models.ClsQC_RequestCheckBillSub> getObjectByJson_QC_RequestCheckBillSub(string jsonString)
        {
            // 如果jsonString已经是数组格式（以[开头，以]结尾），就不需要再加[]
            if (!jsonString.StartsWith("[") && !jsonString.EndsWith("]"))
            {
                jsonString = "[" + jsonString + "]";
            }

            List<Models.ClsQC_RequestCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsQC_RequestCheckBillSub>>(jsonString);
            return list;
        }


        /// <summary>
        /// 将JSON字符串转换为质检申请单主表对象列表
        /// </summary>
        /// <param name="jsonString">JSON字符串</param>
        /// <returns>质检申请单主表对象列表</returns>
        public List<Models.ClsQC_RequestCheckBillMain> getObjectByJson_QC_RequestCheckBillMain1(string jsonString)
        {
            // 如果jsonString已经是数组格式（以[开头，以]结尾），就不需要再加[]
            if (!jsonString.StartsWith("[") && !jsonString.EndsWith("]"))
            {
                jsonString = "[" + jsonString + "]";
            }

            List<Models.ClsQC_RequestCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsQC_RequestCheckBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        /// <returns></returns>    
        public List<Models.ClsKf_ICStockBillMain> getObjectByJson_Kf_ICStockBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
@@ -4742,6 +4876,33 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXs_ExceptiveCheckRequestBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_ExceptiveCheckRequestBillSub>>(jsonString);
            return list;
        }
        #endregion

        #region 车辆轨迹单据
        /// <summary>
        /// 车辆轨迹单据主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsCg_CarTrajectoryBillMain> getObjectByJson_ClsCg_CarTrajectoryBillMain(string jsonString)
        {
            // 按照您的模式，添加方括号包装
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCg_CarTrajectoryBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_CarTrajectoryBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 车辆轨迹单据子表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsCg_CarTrajectoryBillSub> getObjectByJson_ClsCg_CarTrajectoryBillSub(string jsonString)
        {
            // 按照您的模式，添加方括号包装
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsCg_CarTrajectoryBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsCg_CarTrajectoryBillSub>>(jsonString);
            return list;
        }
        #endregion
@@ -5281,5 +5442,55 @@
            return list;
        }

        /// <summary>
        /// 成本项目反序列化
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_CostItem_Model_2> getObjectByJson_Gy_CostItem(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_CostItem_Model_2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CostItem_Model_2>>(jsonString);
            return list;
        }

        /// <summary>
        /// 成本中心反序列化
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_CostCenter_Model_2> getObjectByJson_Gy_CostCenter(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_CostCenter_Model_2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CostCenter_Model_2>>(jsonString);
            return list;
        }


        /// <summary>
        /// 成本分配类型反序列化
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_CostItemFixRate_Model_2> getObjectByJson_Gy_CostItemFixRate(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_CostItemFixRate_Model_2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_CostItemFixRate_Model_2>>(jsonString);
            return list;
        }


        /// <summary>
        /// 成本项目分配标准反序列化
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_Gy_CostItemAverageType_Model_2> getObjectByJson_Gy_CostItemAverageType(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_Gy_CostItemAverageType_Model_2> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_Gy_CostItemAverageType_Model_2>>(jsonString);
            return list;
        }

    }
}