合并分支

chenhaozhe

2 天以前 e4f1a927520a98fbc69dd63ef982dd890ba4fbdc

 WebAPI/ListModels.cs

@@ -8,6 +8,7 @@
using WebAPI.Code;
using Model;
using System.Data;
using System.Text.RegularExpressions;

namespace WebAPI
{
@@ -223,6 +224,30 @@
        {
            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.ClsSc_CustomerTagInfoMain> getCustomerTagInfoMainByJson(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_CustomerTagInfoMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 客户标签反序列化子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_CustomerTagInfoSub> getCustomerTagInfoSubByJson(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_CustomerTagInfoSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_CustomerTagInfoSub>>(jsonString);
            return list;
        }

@@ -1160,7 +1185,55 @@
            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_ProjectMoneyClass_Model> getObjectByJson_Gy_ProjectMoneyClass(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_ProjectMoneyClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ProjectMoneyClass_Model>>(jsonString);
            return list;
        }

        /// <summary>  
        /// 处理新增设备节拍表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsEqiupMaterWorkTimes_Model> getObjectByJson_EqiupMaterWorkTimes(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsEqiupMaterWorkTimes_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsEqiupMaterWorkTimes_Model>>(jsonString);
            return list;
        }

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

        /// <summary>  
        /// 处理新增管径材质表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_PiPeMaterial_Model> getObjectByJson_Gy_PiPeMaterial(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_PiPeMaterial_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PiPeMaterial_Model>>(jsonString);
            return list;
        }

        /// <summary>  
        /// 处理新增防错装置表的json
        /// </summary>
@@ -2094,7 +2167,10 @@
        /// <returns></returns>
        public List<Models.ClsGy_Material_Model> getObjectByJson_Gy_Material(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            if (Regex.IsMatch(jsonString, @"^\[.*\]$") == false)
            {
                jsonString = "[" + jsonString.ToString() + "]";
            }
            List<Models.ClsGy_Material_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_Material_Model>>(jsonString);
            return list;
        }
@@ -2112,6 +2188,18 @@
        }

        /// <summary>
        /// 处理新增巡检项目分类表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_PatrolCheckItemClass_Model> getObjectByJson_Gy_PatrolCheckItemClass(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_PatrolCheckItemClass_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PatrolCheckItemClass_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增点检方法表的json
        /// </summary>
        /// <param name="jsonString"></param>
@@ -2120,6 +2208,18 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_DotCheckItemMethod_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_DotCheckItemMethod_Model>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增巡检方法表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsGy_PatrolCheckItemMethod_Model> getObjectByJson_Gy_PatrolCheckItemMethod(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsGy_PatrolCheckItemMethod_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_PatrolCheckItemMethod_Model>>(jsonString);
            return list;
        }

@@ -2489,6 +2589,28 @@
            return list;
        }

        /// <summary>
        /// 设备巡检计划单 主表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSb_EquipPatrolCheckPlanBillMain> getObjectByJson_Sb_EquipPatrolCheckPlanBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipPatrolCheckPlanBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckPlanBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 设备巡检计划单 子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSb_EquipPatrolCheckPlanBillSub> getObjectByJson_Sb_EquipPatrolCheckPlanBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipPatrolCheckPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckPlanBillSub>>(jsonString);
            return list;
        }


        /// <summary>
@@ -2640,6 +2762,56 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipDotCheckRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckRuleBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        ///  设备巡检规程表 主表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSb_EquipPatrolCheckRuleBillMain> getObjectByJson_Sb_EquipPatrolCheckRuleBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipPatrolCheckRuleBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckRuleBillMain>>(jsonString);
            return list;
        }       

        /// <summary>
        /// 设备巡检规程表 子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSb_EquipPatrolCheckRuleBillSub> getObjectByJson_Sb_EquipPatrolCheckRuleBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipPatrolCheckRuleBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckRuleBillSub>>(jsonString);
            return list;
        }



        /// <summary>
        /// 设备巡检记录表 主表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSb_EquipPatrolCheckBillMain> getObjectByJson_Sb_EquipPatrolCheckBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipPatrolCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckBillMain>>(jsonString);
            return list;
        }
        
        /// <summary>
        /// 设备巡检记录表 子表
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSb_EquipPatrolCheckBillSub> getObjectByJson_Sb_EquipPatrolCheckBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSb_EquipPatrolCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipPatrolCheckBillSub>>(jsonString);
            return list;
        }

@@ -3300,6 +3472,30 @@
            return list;
        }

        /// <summary>
        /// 处理新增模具寿命耗用单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldLifeUseBillMain> getObjectByJson_Gy_MouldLifeUseBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldLifeUseBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldLifeUseBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具寿命耗用单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldLifeUseBillSub> getObjectByJson_Gy_MouldLifeUseBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldLifeUseBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldLifeUseBillSub>>(jsonString);
            return list;
        }


        /// <summary>
        /// 处理新增生产汇报单单主表的json
@@ -3479,6 +3675,17 @@
            return list;
        }

        /// <summary>
        /// PDA处理新增设备巡检记录单主表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSb_EquipPatrolCheckBillMain> getObjectByJson_Sb_EquipPatrolCheckBillMainPDA(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipPatrolCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// PDA处理新增设备点检记录单子表的json
@@ -3489,6 +3696,18 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipDotCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipDotCheckBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// PDA处理新增设备巡检记录单子表的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Models.ClsSb_EquipPatrolCheckBillSub> getObjectByJson_Sb_EquipPatrolCheckBillSubPDA(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSb_EquipPatrolCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSb_EquipPatrolCheckBillSub>>(jsonString);
            return list;
        }

@@ -3636,6 +3855,30 @@
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Models.ClsSc_MESBeginWorkBillSub_RelationBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsSc_MESBeginWorkBillSub_RelationBill>>(jsonString);
            return list;
        }

        /// <summary>
        /// 车间定位小车锁定主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsKf_TrolleyPositionBillMain> getObjectByJson_Kf_TrolleyPositionBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_TrolleyPositionBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_TrolleyPositionBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 车间定位小车锁定子表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsKf_TrolleyPositionBillSub> getObjectByJson_Kf_TrolleyPositionBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_TrolleyPositionBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_TrolleyPositionBillSub>>(jsonString);
            return list;
        }

@@ -4463,6 +4706,21 @@
        }
        #endregion

        #region 生产领料单
        public List<Model.ClsKf_ProductReceiveMaterialBillMain> getObjectByJson_Kf_ProductReceiveMaterialBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_ProductReceiveMaterialBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_ProductReceiveMaterialBillMain>>(jsonString);
            return list;
        }
        public List<Model.ClsKf_ProductReceiveMaterialBillSub> getObjectByJson_Kf_ProductReceiveMaterialBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsKf_ProductReceiveMaterialBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsKf_ProductReceiveMaterialBillSub>>(jsonString);
            return list;
        }
        #endregion

        #region 应收退款单
        /// <summary>
        /// 应收退款单主表json