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

wtt

2024-11-08 fa6a35a3f5299f1722db9f61b26e3d08e9d2eb0f

 WebAPI/ListModels.cs

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

namespace WebAPI
{
@@ -870,6 +871,19 @@
            List<Model.ClsSc_MouldMaintainPlanBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub>>(jsonString);
            return list;
        }

        /// <summary>
        /// 处理新增模具保养计划单子表_计划的json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> getObjectByJson_Sc_MouldMaintainPlanBillSub_Plan(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_MouldMaintainPlanBillSub_Plan> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_MouldMaintainPlanBillSub_Plan>>(jsonString);
            return list;
        }


        /// <summary>
        /// 处理新增模具保养计划单子表保养信息的json
@@ -4138,6 +4152,21 @@
        }
        #endregion

        #region 出门确认单_新
        public List<Model.ClsXs_OutDoorBillMain> getObjectByJson_Xs_OutDoorBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXs_OutDoorBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_OutDoorBillMain>>(jsonString);
            return list;
        }
        public List<Model.ClsXs_OutDoorBillSub> getObjectByJson_Xs_OutDoorBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsXs_OutDoorBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsXs_OutDoorBillSub>>(jsonString);
            return list;
        }
        #endregion

        #region 应收退款单
        /// <summary>
        /// 应收退款单主表json
@@ -4312,6 +4341,30 @@
            return list;
        }

        /// <summary>
        /// 组装追溯-主2
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_AssemblyBillMain> getObjectByJson_Sc_AssemblyBillMain2(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_AssemblyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillMain>>(jsonString);
            return list;
        }

        /// <summary>
        /// 组装追溯-子2
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsSc_AssemblyBillSub> getObjectByJson_Sc_AssemblyBillSub2(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsSc_AssemblyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_AssemblyBillSub>>(jsonString);
            return list;
        }

        ///首件检验单 孙表
        ///ClsQC_FirstPieceCheckBillSub_ValueGrid
        public List<Model.ClsQC_FirstPieceCheckBillSub_ValueGrid> getObjectByJson_ClsQC_FirstPieceCheckBillSub_ValueGrid(string jsonString)
@@ -4412,5 +4465,9 @@
            return list;
        }

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