1

duhe

2023-10-10 e7667d19180c2b79881888c2632c36e28d132233

1

 DAL/DAL.csproj

@@ -765,6 +765,7 @@
    <Compile Include="销售管理\单证管理\ClsXs_CustomsSplitPackBill.cs" />
    <Compile Include="销售管理\单证管理\ClsXs_LadingBill.cs" />
    <Compile Include="销售管理\单证管理\ClsXs_ShippingAdviceBill.cs" />
    <Compile Include="项目管理\ClsPM_WorkTaskWeekBill.cs" />
    <Compile Include="项目管理\ClsPro_DesignBlueRequestBill.cs" />
    <Compile Include="项目管理\ClsPro_ProjectCheckBill.cs" />
    <Compile Include="项目管理\ClsPro_ProjectRequestBill.cs" />

 Model/Model.csproj

@@ -948,6 +948,8 @@
    <Compile Include="销售管理\单证管理\ClsXs_LadingBillSub.cs" />
    <Compile Include="销售管理\单证管理\ClsXs_ShippingAdviceBillMain.cs" />
    <Compile Include="销售管理\单证管理\ClsXs_ShippingAdviceBillSub.cs" />
    <Compile Include="项目管理\ClsPM_WorkTaskWeekBillSub.cs" />
    <Compile Include="项目管理\ClsPM_WorkTaskWeekBillMain.cs" />
    <Compile Include="项目管理\ClsPro_DesignBlueRequestBillMain.cs" />
    <Compile Include="项目管理\ClsPro_DesignBlueRequestBillSub.cs" />
    <Compile Include="项目管理\ClsPro_ProjectCheckBillMain.cs" />

 WebAPI/ListModels.cs

@@ -2618,6 +2618,32 @@
        #endregion


        #region 工作周计划
        /// <summary>
        /// 工作周计划主表json
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsPM_WorkTaskWeekBillMain> getObjectByJson_PM_WorkTaskWeekBillMain(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsPM_WorkTaskWeekBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkTaskWeekBillMain>>(jsonString);
            return list;
        }
        /// <summary>
        /// 工作周计划子表json2
        /// </summary>
        /// <param name="jsonString"></param>
        /// <returns></returns>
        public List<Model.ClsPM_WorkTaskWeekBillSub> getObjectByJson_PM_WorkTaskWeekBillSub(string jsonString)
        {
            jsonString = "[" + jsonString.ToString() + "]";
            List<Model.ClsPM_WorkTaskWeekBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkTaskWeekBillSub>>(jsonString);
            return list;
        }
        #endregion 


        #region 工资计算单 集体
        public List<Models.ClsPay_GroupBalBillMain> getObjectByJson_Pay_GroupBalBillMain(string jsonString)
        {