diff --git a/Reportapi/FrameWork/Fleck/Fleck.csproj b/Reportapi/FrameWork/Fleck/Fleck.csproj
index 068f235..7be24ea 100644
--- a/Reportapi/FrameWork/Fleck/Fleck.csproj
+++ b/Reportapi/FrameWork/Fleck/Fleck.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Fleck</RootNamespace>
     <AssemblyName>Fleck</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj b/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj
index bc1cd8c..c55b119 100644
--- a/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj
+++ b/Reportapi/FrameWork/SqlSugar/SqlSugar.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SqlSugar</RootNamespace>
     <AssemblyName>SqlSugar</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -37,9 +37,8 @@
       <HintPath>..\..\Lib\MySql.Data.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>Lib\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Npgsql, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -308,7 +307,9 @@
     <Content Include="References\Oracle.ManagedDataAccess.dll" />
     <Content Include="References\System.Data.SQLite.dll" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Reportapi/FrameWork/SqlSugar/packages.config b/Reportapi/FrameWork/SqlSugar/packages.config
new file mode 100644
index 0000000..64c7b75
--- /dev/null
+++ b/Reportapi/FrameWork/SqlSugar/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj
index 95928d6..54e4438 100644
--- a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj
+++ b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/Swashbuckle.Core.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swashbuckle</RootNamespace>
     <AssemblyName>Swashbuckle.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config
index e936cc1..c764f53 100644
--- a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config
+++ b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.Core/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj
index 0be46db..3ddde11 100644
--- a/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj
+++ b/Reportapi/FrameWork/SwashbuckleEx/Swashbuckle.WebHost/Swashbuckle.WebHost.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Swashbuckle.WebHost</RootNamespace>
     <AssemblyName>Swashbuckle.WebHost</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Reportapi/MyCode.Project.Domain/App.config b/Reportapi/MyCode.Project.Domain/App.config
index 9472fee..ecabf66 100644
--- a/Reportapi/MyCode.Project.Domain/App.config
+++ b/Reportapi/MyCode.Project.Domain/App.config
@@ -9,7 +9,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderEntryResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderEntryResp.cs
new file mode 100644
index 0000000..c17386c
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderEntryResp.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
+{
+    /// <summary>
+    /// 生产订单大屏数据
+    /// </summary>
+    public class PrdMoOrderEntryResp
+    {
+        /// <summary>
+        /// 生产订单分录行号
+        /// </summary>
+        public int Seq { get; set; }
+
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 生产车间
+        /// </summary>
+        public string DeptName { get; set; }
+
+        /// <summary>
+        /// 数量
+        /// </summary>
+        public decimal Qty { get; set; }
+
+        /// <summary>
+        /// 入库总、数量
+        /// </summary>
+        public decimal InStockQty { get; set; }
+        /// <summary>
+        /// 业务状态
+        /// </summary>
+        public string MoStatus { get; set; }
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs
new file mode 100644
index 0000000..e25a04f
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Message/Response/LxmZHMDReport/PrdMoOrderResp.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyCode.Project.Domain.Message.Response.LxmZHMDReport
+{
+    /// <summary>
+    /// 生产订单大屏数据
+    /// </summary>
+    public class PrdMoOrderResp
+    {
+        /// <summary>
+        /// 生产订单Id
+        /// </summary>
+        public int Fid { get; set; }
+
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        public string FBILLNO { get; set; }
+
+        /// <summary>
+        /// 订单编号
+        /// </summary>
+        public DateTime FDate { get; set; }
+
+        /// <summary>
+        /// 总数量
+        /// </summary>
+        public decimal Qty { get; set; }
+
+        /// <summary>
+        /// 入库总数量
+        /// </summary>
+        public decimal InStockQty { get; set; }
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MO.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MO.cs
new file mode 100644
index 0000000..6449a12
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MO.cs
@@ -0,0 +1,220 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MO
+    {
+           public T_PRD_MO(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FFORMID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FBILLNO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FBILLTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FTRUSTTEED {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FBUSINESSTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FPRDORGID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FWORKSHOPID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FWORKGROUPID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FPLANNERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FOWNERTYPEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FOWNERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FDOCUMENTSTATUS {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FCREATORID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FCREATEDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FMODIFIERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FMODIFYDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FAPPROVERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FAPPROVEDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FCANCELER {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FCANCELDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FCANCELSTATUS {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           public string FISREWORK {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           public string FISENTRUST {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           public int? FENTRUSTORGID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:1
+           /// Nullable:False
+           /// </summary>           
+           public string FPPBOMTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FISSUEMTRL {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FISQCMO {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY.cs
new file mode 100644
index 0000000..934efd4
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY.cs
@@ -0,0 +1,367 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOENTRY
+    {
+           public T_PRD_MOENTRY(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSEQ {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FGROUP {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FPRODUCTTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FMATERIALID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FBASEUNITID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FUNITID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEUNITQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FPLANSTARTDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FPLANFINISHDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FBOMID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FLOT {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FLOT_TEXT {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FMTONO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FPROJECTNO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FROUTINGID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:100
+           /// Nullable:False
+           /// </summary>           
+           public decimal FYIELDRATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FREQUESTORGID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINLIMITH {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESTOCKINLIMITH {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINULRATIO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINLIMITL {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESTOCKINLIMITL {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:100
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINLLRATIO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FISSUSPEND {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSTOCKINORGID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSTOCKID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSTOCKLOCID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FAUXPROPID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FOPERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FPROCESSID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? FCOSTRATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FSRCBILLTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSRCBILLID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FSRCBILLNO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSRCBILLENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSRCBILLENTRYSEQ {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSALEORDERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FSALEORDERNO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSALEORDERENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSALEORDERENTRYSEQ {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEYIELDQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FCOPYENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:newid()
+           /// Nullable:False
+           /// </summary>           
+           public string FROWID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:newid()
+           /// Nullable:False
+           /// </summary>           
+           public string FPARENTROWID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FROWEXPANDTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FBFLOWID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FWORKSHOPID {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_A.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_A.cs
new file mode 100644
index 0000000..18991cd
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_A.cs
@@ -0,0 +1,367 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOENTRY_A
+    {
+           public T_PRD_MOENTRY_A(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINQUASELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINQUASELAUXQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINFAILSELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINFAILSELAUXQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINQUAQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINQUAAUXQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINFAILQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINFAILAUXQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPQUAQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPFAILQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPFAILAUXQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPQUAAUXQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FSTATUS {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FPLANCONFIRMDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FSCHEDULEDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FCONVEYDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FSTARTDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FFINISHDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FCLOSEDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FCOSTDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FCREATETYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPQUASELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPQUASELAUXQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPFAILSELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPFAILSELAUXQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FPRIORITY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FREQTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESTOCKREADYQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKREADYQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASERPTFINISHQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FRPTFINISHQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESCRAPQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSCRAPQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEREPAIRQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESTOCKINSCRAPSELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINSCRAPSELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESTOCKINSCRAPQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINSCRAPQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREPAIRQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FINSTOCKOWNERTYPEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FINSTOCKOWNERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FINSTOCKTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FCHECKPRODUCT {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           public string FOUTPUTOPTQUEUE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FYIELDQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:A
+           /// Nullable:False
+           /// </summary>           
+           public string FQAIP {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FISBACKFLUSH {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string FREQSRC {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_C.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_C.cs
new file mode 100644
index 0000000..2aa21e2
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_C.cs
@@ -0,0 +1,171 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOENTRY_C
+    {
+           public T_PRD_MOENTRY_C(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FCONFIRMID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FRELEASEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSTARTID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FFINISHID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FISMRP {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESAMPLEDAMAGEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSAMPLEDAMAGEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FISENABLESCHEDULE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FPPBOMENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FBOMENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FPATHENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FSRCFORMID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FNOTECOBY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FFIRSTQCCONTROLTYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FISMRPCAL {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FISGENERATEORDER {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEDIRECTSTOCKINQUAQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FDIRECTSTOCKINQUAQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEDIRECTPICKMTRLSELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FDIRECTPICKMTRLSELQTY {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_D.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_D.cs
new file mode 100644
index 0000000..67ff1e5
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_D.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOENTRY_D
+    {
+           public T_PRD_MOENTRY_D(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FMATCHDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FMATCHQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FINVMATCHQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FCOMPLETECON {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FREMARKS {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_L.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_L.cs
new file mode 100644
index 0000000..17bf960
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_L.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOENTRY_L
+    {
+           public T_PRD_MOENTRY_L(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FPKID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FLOCALEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FMEMO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FCLOSEREASON {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_LK.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_LK.cs
new file mode 100644
index 0000000..5f1762b
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_LK.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOENTRY_LK
+    {
+           public T_PRD_MOENTRY_LK(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FLINKID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSTABLEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSBILLID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FLNKTRACKERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FLNKSSTATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FLNKAMOUNT {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FLNKSETOMOTRACKERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FLNKSETOMOSSTATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FLNKSETOMOAMOUNT {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FFLOWID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FFLOWLINEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FRULEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FSTABLENAME {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEUNITQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEUNITQTYOLD {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_Q.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_Q.cs
new file mode 100644
index 0000000..ce74f25
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOENTRY_Q.cs
@@ -0,0 +1,339 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOENTRY_Q
+    {
+           public T_PRD_MOENTRY_Q(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FNOSTOCKINQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASENOSTOCKINQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FFORCECLOSERID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FCLOSETYPE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FREMWORKSHOPID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSCHEDULESEQ {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FSCHEDULESTARTTIME {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FSCHEDULEFINISHTIME {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FSNUNITID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSNQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FSCHEDULEPROCSPLIT {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FRESTKQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASERESTKQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FRESTKQUAQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASERESTKQUAQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FRESTKFAILQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASERESTKFAILQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FRESTKSCRAPQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASERESTKSCRAPQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FPICKMTLQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEPICKMTLQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FISNEWLC {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FPICKMTRLSTATUS {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FISSUEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEISSUEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FSRCSPLITBILLNO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSRCSPLITSEQ {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSRCSPLITENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSRCSPLITID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FMOCHANGEFLAG {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FSRCBOMENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEREMADEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FREMADEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESTOCKINREMADEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINREMADEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESTOCKINREMADESELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSTOCKINREMADESELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASERESTKREMADEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FRESTKREMADEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:1
+           /// Nullable:False
+           /// </summary>           
+           public string FSCHEDULESTATUS {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESCHEDULEDQTYSUM {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSCHEDULEDQTYSUM {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public string FISFIRSTINSPECT {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:A
+           /// Nullable:False
+           /// </summary>           
+           public string FFIRSTINSPECTSTATUS {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOSCHEDULEDETAIL.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOSCHEDULEDETAIL.cs
new file mode 100644
index 0000000..e2fe10a
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOSCHEDULEDETAIL.cs
@@ -0,0 +1,206 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOSCHEDULEDETAIL
+    {
+           public T_PRD_MOSCHEDULEDETAIL(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public int FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public int FID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FMOENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FSEQ {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FMOSEQ {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FMATERIALID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FDAILYOUTPUTQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEDAILYOUTPUTQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FPLANQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEPLANQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FUNITID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FBASEUNITID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSCHEDULEDQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESCHEDULEDQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FPRODUCTIONLINEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FPLANSTARTDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? FPLANFINISHDATE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           public string FISLOCKED {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FSCHDTLROWID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEDIFFERQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FDIFFERQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEFINISHEDQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FFINISHEDQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FMATCHQTY1 {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FMATCHQTY2 {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FISSUEQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASEISSUEQTY {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOSNDETAIL.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOSNDETAIL.cs
new file mode 100644
index 0000000..43bd3ac
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MOSNDETAIL.cs
@@ -0,0 +1,101 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MOSNDETAIL
+    {
+           public T_PRD_MOSNDETAIL(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FDETAILID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FENTRYID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FSEQ {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FSERIALID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default: 
+           /// Nullable:False
+           /// </summary>           
+           public string FSERIALNO {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FSERIALNOTE {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSNQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSNSTOCKINSELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FSNRPTSELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESNQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESNRPTSELQTY {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public decimal FBASESNSTOCKINSELQTY {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MO_L.cs b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MO_L.cs
new file mode 100644
index 0000000..cf1ea91
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Model/PrdMo/T_PRD_MO_L.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Linq;
+using System.Text;
+
+namespace MyCode.Project.Domain.Model.PrdMo
+{
+    ///<summary>
+    ///
+    ///</summary>
+    public partial class T_PRD_MO_L
+    {
+           public T_PRD_MO_L(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:False
+           /// </summary>           
+           public int FPKID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? FLOCALEID {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string FDESCRIPTION {get;set;}
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
index 5eed7b9..69968f2 100644
--- a/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
+++ b/Reportapi/MyCode.Project.Domain/MyCode.Project.Domain.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MyCode.Project.Domain</RootNamespace>
     <AssemblyName>MyCode.Project.Domain</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -68,6 +68,8 @@
     <Compile Include="Message\Response\Common\IdName.cs" />
     <Compile Include="Message\Response\Common\ItemResult.cs" />
     <Compile Include="Message\Response\Common\ListHeadFieldData.cs" />
+    <Compile Include="Message\Response\LxmZHMDReport\PrdMoOrderEntryResp.cs" />
+    <Compile Include="Message\Response\LxmZHMDReport\PrdMoOrderResp.cs" />
     <Compile Include="Message\Response\LxmZHMDReport\ReportCalRateResp.cs" />
     <Compile Include="Message\Response\LxmZHMDReport\SalOrderResp.cs" />
     <Compile Include="Message\Response\PurOrder\PurOrderMainResp.cs" />
@@ -81,11 +83,23 @@
     <Compile Include="Message\Response\WorkProcess\WorkProcessResp.cs" />
     <Compile Include="Model\ApiLog.cs" />
     <Compile Include="Model\JackOrders.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MO.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOENTRY.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOENTRY_A.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOENTRY_C.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOENTRY_D.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOENTRY_L.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOENTRY_LK.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOENTRY_Q.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOSCHEDULEDETAIL.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MOSNDETAIL.cs" />
+    <Compile Include="Model\PrdMo\T_PRD_MO_L.cs" />
     <Compile Include="Model\PushKingDeeOrder.cs" />
     <Compile Include="Model\SysWorkprocessHistory.cs" />
     <Compile Include="Model\YTKJTShopParameter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Repositories\IApiLogRepository.cs" />
+    <Compile Include="Repositories\IMOOrdersRepository.cs" />
     <Compile Include="Repositories\IJackOrdersRepository.cs" />
     <Compile Include="Repositories\IPurOrderRepository.cs" />
     <Compile Include="Repositories\IRepository.cs" />
diff --git a/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs b/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs
new file mode 100644
index 0000000..7a21e00
--- /dev/null
+++ b/Reportapi/MyCode.Project.Domain/Repositories/IMOOrdersRepository.cs
@@ -0,0 +1,35 @@
+using MyCode.Project.Domain;
+using MyCode.Project.Domain.Message;
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Domain.Model;
+using MyCode.Project.Infrastructure;
+using MyCode.Project.Infrastructure.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyCode.Project.Domain.Repositories
+{
+    public interface IMOOrdersRepository : IRepository<JackOrders>
+    {
+
+
+        /// <summary>
+        /// 获取生产数据
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        PageResult<PrdMoOrderResp> GetPrdMoPageList(PagedSearch search);
+
+
+        /// <summary>
+        /// 获取生产订单分录信息
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        PageResult<PrdMoOrderEntryResp> GetPrdMoEntryPageList(PagedSearch<IdAct> search);
+    }
+}
diff --git a/Reportapi/MyCode.Project.GenerateCode/App.config b/Reportapi/MyCode.Project.GenerateCode/App.config
index 35fc290..3ca80bd 100644
--- a/Reportapi/MyCode.Project.GenerateCode/App.config
+++ b/Reportapi/MyCode.Project.GenerateCode/App.config
@@ -104,7 +104,7 @@
      
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
diff --git a/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj b/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj
index ce7184d..6f8f56d 100644
--- a/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj
+++ b/Reportapi/MyCode.Project.GenerateCode/MyCode.Project.GenerateCode.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>MyCode.Project.GenerateCode</RootNamespace>
     <AssemblyName>MyCode.Project.GenerateCode</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj b/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj
index 4282fc8..83a2df7 100644
--- a/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj
+++ b/Reportapi/MyCode.Project.Infrastructure/MyCode.Project.Infrastructure.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MyCode.Project.Infrastructure</RootNamespace>
     <AssemblyName>MyCode.Project.Infrastructure</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
diff --git a/Reportapi/MyCode.Project.Infrastructure/app.config b/Reportapi/MyCode.Project.Infrastructure/app.config
index e46a897..4769706 100644
--- a/Reportapi/MyCode.Project.Infrastructure/app.config
+++ b/Reportapi/MyCode.Project.Infrastructure/app.config
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" />
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
      
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/Reportapi/MyCode.Project.Infrastructure/packages.config b/Reportapi/MyCode.Project.Infrastructure/packages.config
index 651819d..aa6288e 100644
--- a/Reportapi/MyCode.Project.Infrastructure/packages.config
+++ b/Reportapi/MyCode.Project.Infrastructure/packages.config
@@ -10,10 +10,10 @@
   <package id="log4net" version="2.0.8" targetFramework="net45" />
   <package id="MiniExcel" version="1.30.0" targetFramework="net461" />
   <package id="NPOI" version="2.2.1" targetFramework="net45" />
-  <package id="Pipelines.Sockets.Unofficial" version="1.0.7" targetFramework="net461" />
+  <package id="Pipelines.Sockets.Unofficial" version="1.0.7" targetFramework="net461" requireReinstallation="true" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
   <package id="sqlSugar" version="4.6.4.9" targetFramework="net45" />
-  <package id="StackExchange.Redis" version="2.0.519" targetFramework="net461" />
+  <package id="StackExchange.Redis" version="2.0.519" targetFramework="net461" requireReinstallation="true" />
   <package id="System.Diagnostics.PerformanceCounter" version="4.5.0" targetFramework="net462" />
   <package id="System.IO.Pipelines" version="4.5.1" targetFramework="net461" />
   <package id="System.Memory" version="4.5.1" targetFramework="net461" />
@@ -25,5 +25,5 @@
   <package id="Unity" version="4.0.1" targetFramework="net45" />
   <package id="Unity.Interception" version="4.0.1" targetFramework="net45" />
   <package id="Unofficial.Ionic.Zip" version="1.9.1.8" targetFramework="net45" />
-  <package id="ZXing.Net" version="0.15.0" targetFramework="net45" />
+  <package id="ZXing.Net" version="0.15.0" targetFramework="net45" requireReinstallation="true" />
 </packages>
\ No newline at end of file
diff --git a/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj b/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj
index e28eb1d..dba8d7b 100644
--- a/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj
+++ b/Reportapi/MyCode.Project.OutSideService/MyCode.Project.OutSideService.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MyCode.Project.OutSideService</RootNamespace>
     <AssemblyName>MyCode.Project.OutSideService</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -43,8 +43,8 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Qiniu">
       <HintPath>..\Lib\Qiniu.dll</HintPath>
diff --git a/Reportapi/MyCode.Project.OutSideService/app.config b/Reportapi/MyCode.Project.OutSideService/app.config
index 62fa261..a89b837 100644
--- a/Reportapi/MyCode.Project.OutSideService/app.config
+++ b/Reportapi/MyCode.Project.OutSideService/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
diff --git a/Reportapi/MyCode.Project.OutSideService/packages.config b/Reportapi/MyCode.Project.OutSideService/packages.config
index 5ef9265..a81220f 100644
--- a/Reportapi/MyCode.Project.OutSideService/packages.config
+++ b/Reportapi/MyCode.Project.OutSideService/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net461" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net461" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
   <package id="Senparc.CO2NET" version="1.3.104" targetFramework="net461" />
   <package id="Senparc.CO2NET.APM" version="0.9.104" targetFramework="net461" />
   <package id="Senparc.NeuChar" version="1.2.105" targetFramework="net461" />
diff --git a/Reportapi/MyCode.Project.Repositories/App.config b/Reportapi/MyCode.Project.Repositories/App.config
index 5172969..3c691af 100644
--- a/Reportapi/MyCode.Project.Repositories/App.config
+++ b/Reportapi/MyCode.Project.Repositories/App.config
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" />
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
     
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
index 5613904..d8e4d10 100644
--- a/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
+++ b/Reportapi/MyCode.Project.Repositories/JackOrdersRepository.cs
@@ -10,6 +10,7 @@ using MyCode.Project.Domain.Repositories;
 using MyCode.Project.Infrastructure.Common;
 using MyCode.Project.Infrastructure.Search;
 using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Domain.Message.Act.Common;
 
 namespace MyCode.Project.Repositories
 {
@@ -23,12 +24,19 @@ namespace MyCode.Project.Repositories
         {
           
             SearchCondition where = new SearchCondition();
+            
+                 where.AddSqlCondition(" 1=1 ", true);
 
-                 where.AddSqlCondition("a.FDOCUMENTSTATUS='C' ", true);
-
-            string sql = $@" SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID  FROM T_SAL_ORDER  A WITH(NOLOCK)
-     LEFT JOIN T_BD_CUSTOMER Cccc  WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID  
-     LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 ";
+            string sql = $@" 
+ SELECT * ,(FQTY-FStockOutQty) AS FRemainOutQty,OutboundPercentage=CONVERT(DECIMAL(18,2),(CASE WHEN FQTY !=0 THEN FStockOutQty/FQTY*1.00 ELSE 0 END)) 
+ FROM (
+ SELECT C.FNAME AS CustomerName,a.FBILLNO,a.FDATE,a.FID
+ ,(SELECT SUM(FStockOutQty) FROM T_SAL_ORDERENTRY_R g WHERE g.FID=a.FID) AS FStockOutQty
+  ,(SELECT SUM(g.FQTY) FROM T_SAL_ORDERENTRY g WHERE g.FID=a.FID) AS FQTY
+ FROM T_SAL_ORDER  A WITH(NOLOCK)
+ LEFT JOIN T_BD_CUSTOMER Cccc  WITH(NOLOCK) ON Cccc.FCUSTID= A.FCUSTID  
+ LEFT JOIN T_BD_CUSTOMER_L C WITH(NOLOCK) ON C.FCUSTID= A.FCUSTID AND C.FLOCALEID= 2052 
+ WHERE a.FDOCUMENTSTATUS='C') a ";
 
            
             var list = this.SelectListPage<SalOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc ");
diff --git a/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs b/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs
new file mode 100644
index 0000000..63d5768
--- /dev/null
+++ b/Reportapi/MyCode.Project.Repositories/MOOrdersRepository.cs
@@ -0,0 +1,111 @@
+using MyCode.Project.Domain.Message;
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Domain.Model;
+using MyCode.Project.Domain.Repositories;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Infrastructure.Search;
+using MyCode.Project.Repositories.Common;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MyCode.Project.Repositories
+{
+    public class MOOrdersRepository : Repository<JackOrders>, IMOOrdersRepository
+    {
+        public MOOrdersRepository(MyCodeSqlSugarClient context) : base(context)
+        { }
+        /// <summary>
+        /// 查询生产订单表体
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        public PageResult<PrdMoOrderEntryResp> GetPrdMoEntryPageList(PagedSearch<IdAct> search)
+        {
+            SearchCondition where = new SearchCondition();
+            where.AddSqlCondition($"t1e.FID={search.Condition.Id} ", true);
+            string sql = $@"
+SELECT
+    t1e.FSEQ Seq,
+    tm_l.FNAME MaterialName,
+    t2_l.FNAME DeptName,
+    t1e.FQTY Qty,
+    t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY InStockQty,
+    CASE
+        WHEN t1e_a.FSTATUS = 1 THEN '计划'
+        WHEN t1e_a.FSTATUS = 2 THEN '计划确认'
+        WHEN t1e_a.FSTATUS = 3 THEN '下达'
+        WHEN t1e_a.FSTATUS = 4 THEN '开工'
+        WHEN t1e_a.FSTATUS = 5 THEN '完工'
+        WHEN t1e_a.FSTATUS = 6 THEN '结案'
+        WHEN t1e_a.FSTATUS = 7 THEN '结算'
+        ELSE ''
+    END MoStatus
+FROM
+    T_PRD_MOENTRY t1e
+    LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID
+    LEFT JOIN T_BD_MATERIAL tm ON t1e.FMATERIALID = tm.FMATERIALID
+    LEFT JOIN T_BD_MATERIAL_L tm_l ON tm_l.FMATERIALID = tm.FMATERIALID
+    AND tm_l.FLOCALEID = 2052
+    LEFT JOIN T_BD_DEPARTMENT t2 ON t1e.FWORKSHOPID = t2.FDEPTID
+    LEFT JOIN T_BD_DEPARTMENT_L t2_l ON t2.FDEPTID = t2_l.FDEPTID
+    AND t2_l.FLOCALEID = 2052
+
+";
+
+
+            var list = this.SelectListPage<PrdMoOrderEntryResp>(sql, where, search.Page, search.PageSize, $@"SEQ desc ");
+            return list;
+        }
+
+
+
+        /// <summary>
+        /// 查询生产订单表头
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        public PageResult<PrdMoOrderResp> GetPrdMoPageList(PagedSearch search)
+        {
+            SearchCondition where = new SearchCondition();
+            where.AddSqlCondition("1=1 ", true);
+
+            string sql = $@"
+SELECT
+    *
+FROM
+    (
+        SELECT
+            t1.FID Fid,
+            t1.FBILLNO FBillNo,
+            t1.FDATE FDate,
+            SUM(t1e.FQTY) Qty,
+            SUM(
+                t1e_a.FSTOCKINFAILAUXQTY + t1e_a.FSTOCKINQUAAUXQTY
+            ) InStockQty
+        FROM
+            T_PRD_MO t1
+            LEFT JOIN T_PRD_MOENTRY t1e ON t1.FID = t1e.FID
+            LEFT JOIN T_PRD_MOENTRY_A t1e_a ON t1e.FENTRYID = t1e_a.FENTRYID
+        WHERE
+            1 = 1
+            AND t1.FDOCUMENTSTATUS = 'C'
+        GROUP BY
+            t1.FID,
+            t1.FBILLNO,
+            t1.FDATE
+    ) t1Temp
+
+";
+
+
+            var list = this.SelectListPage<PrdMoOrderResp>(sql, where, search.Page, search.PageSize, $@"FDATE desc ");
+            return list;
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
index 6040b3c..7164f12 100644
--- a/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
+++ b/Reportapi/MyCode.Project.Repositories/MyCode.Project.Repositories.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MyCode.Project.Repositories</RootNamespace>
     <AssemblyName>MyCode.Project.Repositories</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
@@ -86,6 +86,7 @@
     <Compile Include="Common\Repository`.cs" />
     <Compile Include="Common\TransactionCallHandler.cs" />
     <Compile Include="Common\TransactionCallHandlerAttribute.cs" />
+    <Compile Include="MOOrdersRepository.cs" />
     <Compile Include="JackOrdersRepository.cs" />
     <Compile Include="Lxm\LxmReportRepository.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/Reportapi/MyCode.Project.ScheduleTask/App.config b/Reportapi/MyCode.Project.ScheduleTask/App.config
index 3ae4efb..723de74 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/App.config
+++ b/Reportapi/MyCode.Project.ScheduleTask/App.config
@@ -152,7 +152,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
diff --git a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
index 99dff04..2e0176f 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
+++ b/Reportapi/MyCode.Project.ScheduleTask/MyCode.Project.ScheduleTask.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MyCode.Project.ScheduleTask</RootNamespace>
     <AssemblyName>MyCode.Project.ScheduleTask</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -65,9 +65,8 @@
     <Reference Include="Microsoft.Practices.Unity.Interception.Configuration">
       <HintPath>..\Lib\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Lib\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Quartz, Version=2.0.0.400, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/Reportapi/MyCode.Project.ScheduleTask/packages.config b/Reportapi/MyCode.Project.ScheduleTask/packages.config
index 3d3ceea..3624357 100644
--- a/Reportapi/MyCode.Project.ScheduleTask/packages.config
+++ b/Reportapi/MyCode.Project.ScheduleTask/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="log4net" version="2.0.8" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.1" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
   <package id="Senparc.Weixin" version="4.14.0" targetFramework="net45" />
   <package id="Senparc.Weixin.MP" version="14.6.3" targetFramework="net45" />
   <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.0.0" targetFramework="net462" />
diff --git a/Reportapi/MyCode.Project.Services/App.config b/Reportapi/MyCode.Project.Services/App.config
index e46a897..4769706 100644
--- a/Reportapi/MyCode.Project.Services/App.config
+++ b/Reportapi/MyCode.Project.Services/App.config
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369" />
+        <assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-0.85.4.369" newVersion="0.85.4.369"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
       </dependentAssembly>
      
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
diff --git a/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs b/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs
new file mode 100644
index 0000000..b9df1bc
--- /dev/null
+++ b/Reportapi/MyCode.Project.Services/IServices/IPrdOrderService.cs
@@ -0,0 +1,25 @@
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Infrastructure.JackYun;
+
+namespace MyCode.Project.Services
+{
+    public interface IPrdOrderService
+    {
+        /// <summary>
+        /// 获取生产订单列表数据
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        PageResult<PrdMoOrderResp> GetPrdMoPageList(PagedSearch search);
+
+        /// <summary>
+        /// 获取生产订单明细列表数据
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        PageResult<PrdMoOrderEntryResp> GetPrdMoEntryPageList(PagedSearch<IdAct> search);
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Services/IServices/IZhuBinService.cs b/Reportapi/MyCode.Project.Services/IServices/IZhuBinService.cs
deleted file mode 100644
index fa692d2..0000000
--- a/Reportapi/MyCode.Project.Services/IServices/IZhuBinService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using MyCode.Project.Infrastructure.JackYun;
-
-namespace MyCode.Project.Services
-{
-    public interface IZhuBinService
-    {
-       
-
-    }
-}
diff --git a/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs b/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs
new file mode 100644
index 0000000..349eb1f
--- /dev/null
+++ b/Reportapi/MyCode.Project.Services/Implementation/PrdOrderService.cs
@@ -0,0 +1,38 @@
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Request.JackYun;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Domain.Repositories;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Infrastructure.JackYun;
+using MyCode.Project.Repositories;
+using System;
+
+namespace MyCode.Project.Services.Implementation
+{
+    public class PrdOrderService : ServiceBase, IPrdOrderService
+    {
+
+        private IMOOrdersRepository _MOOrdersRepository;
+
+        public PrdOrderService(IMOOrdersRepository MOOrdersRepository)
+        {
+            _MOOrdersRepository = MOOrdersRepository;
+        }
+
+        public PageResult<PrdMoOrderEntryResp> GetPrdMoEntryPageList(PagedSearch<IdAct> search)
+        {
+            return _MOOrdersRepository.GetPrdMoEntryPageList(search);
+        }
+
+        /// <summary>
+        /// 生产订单列表
+        /// </summary>
+        /// <param name="search"></param>
+        /// <returns></returns>
+        public PageResult<PrdMoOrderResp> GetPrdMoPageList(PagedSearch search)
+        {
+            return _MOOrdersRepository.GetPrdMoPageList(search);
+        }
+
+    }
+}
diff --git a/Reportapi/MyCode.Project.Services/Implementation/ZhuBinService.cs b/Reportapi/MyCode.Project.Services/Implementation/ZhuBinService.cs
deleted file mode 100644
index 0ca2138..0000000
--- a/Reportapi/MyCode.Project.Services/Implementation/ZhuBinService.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using MyCode.Project.Domain.Message.Request.JackYun;
-using MyCode.Project.Domain.Repositories;
-using MyCode.Project.Infrastructure.Common;
-using MyCode.Project.Infrastructure.JackYun;
-using System;
-
-namespace MyCode.Project.Services.Implementation
-{
-    public class ZhuBinService : ServiceBase //, IZhuBinService
-    {
-
-        private IYTKJTShopParameterRepository _yTKJTShopParameterRepository;
-
-        public ZhuBinService(IYTKJTShopParameterRepository yTKJTShopParameterRepository)
-        {
-            _yTKJTShopParameterRepository = yTKJTShopParameterRepository;
-        }
-
-    }
-}
diff --git a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
index 870aa3a..45ac2ad 100644
--- a/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
+++ b/Reportapi/MyCode.Project.Services/MyCode.Project.Services.csproj
@@ -12,7 +12,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MyCode.Project.Services</RootNamespace>
     <AssemblyName>MyCode.Project.Services</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -115,15 +115,25 @@
     <Compile Include="BLL\WebSocketBLL.cs" />
     <Compile Include="Implementation\AnsyDataProcessService.cs" />
     <Compile Include="Implementation\ApiLogService.cs" />
+<<<<<<< HEAD
     <Compile Include="Implementation\ZhuBinService.cs" />
     <Compile Include="Implementation\PurOrderService.cs" />
+=======
+    <Compile Include="Implementation\PrdOrderService.cs" />
+    <Compile Include="Implementation\LiQiongHaiService.cs" />
+>>>>>>> fa17cd7e027b15543cc15e73cd9d1e8e7d5c05e9
     <Compile Include="Implementation\YuyuboService.cs" />
     <Compile Include="Implementation\ReportService.cs" />
     <Compile Include="Implementation\QueueProcessService.cs" />
     <Compile Include="Implementation\WebSocketService.cs" />
     <Compile Include="IServices\IAnsyDataProcessService.cs" />
+<<<<<<< HEAD
     <Compile Include="IServices\IPurOrderService.cs" />
     <Compile Include="IServices\IZhuBinService.cs" />
+=======
+    <Compile Include="IServices\ILiQiongHaiService.cs" />
+    <Compile Include="IServices\IPrdOrderService.cs" />
+>>>>>>> fa17cd7e027b15543cc15e73cd9d1e8e7d5c05e9
     <Compile Include="IServices\IYuyuboService.cs" />
     <Compile Include="IServices\IApiLogService.cs" />
     <Compile Include="IServices\IItemListService.cs" />
diff --git a/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs b/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs
index 479a430..e84796f 100644
--- a/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs
+++ b/Reportapi/MyCode.Project.WebApi/Areas/Admin/Controllers/DataChartController.cs
@@ -28,21 +28,7 @@ namespace MyCode.Project.WebApi.Areas.Admin.Controllers
 
         }
         #endregion
-
-        #region Test(测试方法)
-        /// <summary>
-        /// 测试方法
-        /// </summary>
-        [AllowAnonymous]
-        [HttpGet]
-        public string Test()
-        {
-
-            return "test";
-
-        }
-        #endregion
-
+      
 
         /// <summary>
         /// 销售订单列表
diff --git a/Reportapi/MyCode.Project.WebApi/Controllers/PrdMoController.cs b/Reportapi/MyCode.Project.WebApi/Controllers/PrdMoController.cs
new file mode 100644
index 0000000..1d167cb
--- /dev/null
+++ b/Reportapi/MyCode.Project.WebApi/Controllers/PrdMoController.cs
@@ -0,0 +1,50 @@
+using MyCode.Project.Domain.Message.Act.Common;
+using MyCode.Project.Domain.Message.Response.LxmZHMDReport;
+using MyCode.Project.Infrastructure.Common;
+using MyCode.Project.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Web.Http;
+
+namespace MyCode.Project.WebApi.Controllers
+{
+    /// <summary>
+    /// 生产订单
+    /// </summary>
+    public class PrdMoController : BaseAPIController
+    {
+        private IPrdOrderService _prdOrderService;
+        /// <summary>
+        /// 生产订单
+        /// </summary>
+        public PrdMoController(IPrdOrderService prdOrderService)
+        {
+            _prdOrderService = prdOrderService;
+        }
+
+
+        /// <summary>
+        /// 获取生产订单
+        /// </summary>
+        [AllowAnonymous]
+        [HttpPost]
+        public PageResult<PrdMoOrderResp> GetMoRespData(PagedSearch pagedSearch)
+        {
+            return _prdOrderService.GetPrdMoPageList(pagedSearch);
+        }
+
+        /// <summary>
+        /// 获取生产订单
+        /// </summary>
+        [AllowAnonymous]
+        [HttpPost]
+
+        public PageResult<PrdMoOrderEntryResp> GetMoEntryRespData(PagedSearch<IdAct> search)
+        {
+            return _prdOrderService.GetPrdMoEntryPageList(search);
+        }
+    }
+}
diff --git a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
index 14e5972..ddd07f7 100644
--- a/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
+++ b/Reportapi/MyCode.Project.WebApi/MyCode.Project.WebApi.csproj
@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MyCode.Project.WebApi</RootNamespace>
     <AssemblyName>MyCode.Project.WebApi</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <MvcBuildViews>false</MvcBuildViews>
     <UseIISExpress>false</UseIISExpress>
     <IISExpressSSLPort />
@@ -106,9 +106,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Lib\netstandard.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\Lib\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -209,6 +208,7 @@
     <Compile Include="Areas\Wechat\Controllers\BaseWechatController.cs" />
     <Compile Include="Areas\Wechat\Controllers\ReportController.cs" />
     <Compile Include="Controllers\BaseAPIController.cs" />
+    <Compile Include="Controllers\PrdMoController.cs" />
     <Compile Include="Controllers\TestController.cs" />
     <Compile Include="Global.asax.cs">
       <DependentUpon>Global.asax</DependentUpon>
diff --git a/Reportapi/MyCode.Project.WebApi/Properties/PublishProfiles/FolderProfile.pubxml b/Reportapi/MyCode.Project.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
index 036ae7a..8669412 100644
--- a/Reportapi/MyCode.Project.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/Reportapi/MyCode.Project.WebApi/Properties/PublishProfiles/FolderProfile.pubxml
@@ -10,9 +10,9 @@
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <publishUrl>E:\Git\MyCodeMySql\Publish</publishUrl>
-    <DeleteExistingFiles>True</DeleteExistingFiles>
+    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+    <ExcludeApp_Data>true</ExcludeApp_Data>
+    <publishUrl>C:\Users\1YBOOK\Desktop\发布</publishUrl>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Reportapi/MyCode.Project.WebApi/Web.config b/Reportapi/MyCode.Project.WebApi/Web.config
deleted file mode 100644
index fba5b9f..0000000
--- a/Reportapi/MyCode.Project.WebApi/Web.config
+++ /dev/null
@@ -1,253 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  For more information on how to configure your ASP.NET application, please visit
-  https://go.microsoft.com/fwlink/?LinkId=301879
-  -->
-<configuration>
-  
-  <configSections>
-    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
-  </configSections>
-  
-  <system.webServer>
-    <httpProtocol>
-      <customHeaders>
-        <add name="Access-Control-Allow-Origin" value="*" />
-        <add name="Access-Control-Allow-Methods" value="*" />
-        <add name="Access-Control-Allow-Headers" value="Content-type,Authorization,*" />
-        <add name="Access-Control-Request-Headers" value="*" />
-        <add name="Access-Control-Request-Method" value="*" />
-        <add name="Access-Control-Allow-Credentials" value="*" />
-        <add name="Access-Control-Max-Age" value="1728000" />
-      </customHeaders>
-    </httpProtocol>
-  </system.webServer>
-  <connectionStrings>
-
-    <!-- 数据库测试-->
-    <add name="WMSConn" connectionString="Data Source=8.138.110.197,1433; Initial Catalog=AIS20240310221756; User ID=sa;Password=12qw!@; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun2" providerName="System.Data.SqlClient" />
-	  <add name="YunTongConn" connectionString="Data Source=8.138.110.197,1433; Initial Catalog=AIS20240310221756; User ID=sa;Password=12qw!@; Connect Timeout=120; MultipleActiveResultSets=True;App=JiKeYun1" providerName="System.Data.SqlClient" />
-	 
-	  <!--测试MYSQL内网-->
-	  
-    <!--<add name="MasterConn" connectionString="" providerName="MySql.Data.MySqlClient" />-->
-    
-  </connectionStrings>
-  <appSettings>
-    <!--解决swagger出错问题-->
-    <add key="aspnet:UseHostHeaderForRequestUrl" value="true" />
-    <!--当前环境,1:生产环境 0：开发环境-->
-    <add key="Env" value="0" />
-    <!--因公司IP时常变化，先用13跳转-->
-    <add key="RedisAddress" value="" />
-    <!--缓存前缀-->
-    <add key="CachePrefix" value="" />
-    <!--jwtkey-->
-    <add key="JwtKey" value="t9Hu5zhiFWunJR1+XDrUM6Jp2aAvTjOa/XoxOrZ7bbI=" />
-    <!--是否输出Sql命令0:不输出 1:输出-->
-    <add key="OutputSql" value="0" />
-    <!--是否输出请求日志-->
-    <add key="OutputRequstLog" value="1" />
-    <!--本地上传的存放路径-->
-    <add key="UploadFolder" value="D:\" />
-    <!--取消owin启动-->
-    <add key="owin:AutomaticAppStartup" value="false" />
-    <!--钉钉通知机器人-->
-    <add key="DingDingApiUrl" value="" />
-   
-    <!--区域层增加的前缀路径-->
-    <add key="AreaUrlPrePath" value="" />
-
-    <!--生产环境D:\publish\lxm-report-api\App_File\-->
-    <!--服务器文件保存的路径，这里调度用，如果是webapi则不需要用这个-->
-    <add key="AppFilePath" value="D:\publish\LxmReportApi\api\App_File\" />
-    <!--<add key="AppFilePath" value="D:\App_File\" />-->
-    
-  
-    <add key="WebSocketUrl" value="ws://127.0.0.1:9798/" /> 
- 
-  </appSettings>
-  <!--
-    有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
-
-    可在 <httpRuntime> 标记上设置以下特性。
-      <system.Web>
-        <httpRuntime targetFramework="4.5" />
-      </system.Web>
-  -->
-  <system.web>
-    <authentication mode="None" />
-    <compilation debug="true" targetFramework="4.6.1" />
-    <httpRuntime targetFramework="4.6.1" />
-    <customErrors mode="Off" />
-  </system.web>
-  <log4net>
-    <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <!--日志路径-->
-      <param name="File" value="App_Log\Error\" />
-      <!--是否是向文件中追加日志-->
-      <param name="AppendToFile" value="true" />
-      <!--log保留天数-->
-      <param name="MaxSizeRollBackups" value="30" />
-      <!--日志文件名是否是固定不变的-->
-      <param name="StaticLogFileName" value="false" />
-      <!--日志文件名格式为:2008-08-31.log-->
-      <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" />
-      <!--日志根据日期滚动-->
-      <param name="RollingStyle" value="Date" />
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" />
-      </layout>
-      <filter type="log4net.Filter.LevelRangeFilter">
-        <levelMin value="ERROR" />
-        <levelMax value="ERROR" />
-        <filter type="log4net.Filter.DenyAllFilter" />
-      </filter>
-    </appender>
-
-    <appender name="InfoLogFileAppender" type="log4net.Appender.RollingFileAppender">
-      <!--日志路径-->
-      <param name="File" value="App_Log\Info\" />
-      <!--是否是向文件中追加日志-->
-      <param name="AppendToFile" value="true" />
-      <!--log保留天数-->
-      <param name="MaxSizeRollBackups" value="30" />
-      <!--日志文件名是否是固定不变的-->
-      <param name="StaticLogFileName" value="false" />
-      <!--日志文件名格式为:2008-08-31.log-->
-      <param name="DatePattern" value="yyyy-MM-dd&quot;.log&quot;" />
-      <!--日志根据日期滚动-->
-      <param name="RollingStyle" value="Date" />
-      <layout type="log4net.Layout.PatternLayout">
-        <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n %logger" />
-      </layout>
-      <filter type="log4net.Filter.LevelRangeFilter">
-        <levelMin value="INFO" />
-        <levelMax value="INFO" />
-        <filter type="log4net.Filter.DenyAllFilter" />
-      </filter>
-    </appender>
-
-    <!-- MySQL Appender -->
-    <!--<appender name="AdoNetAppender" type="log4net.Appender.AdoNetAppender">
-      <bufferSize value="1" />
-      <connectionType value="MySql.Data.MySqlClient.MySqlConnection, MySql.Data" />
-      <connectionString value="Server=;port=3306;Database=;Uid=;Pwd=;charset=utf8mb4" />
-      <commandText value="INSERT INTO api_log (level,message,api_type,create_time) VALUES (?log_level,?message,4, ?log_date)" />
-
-      <parameter>
-        <parameterName value="?log_date" />
-        <dbType value="DateTime" />
-        <layout type="log4net.Layout.RawTimeStampLayout" />
-      </parameter>
-
-      <parameter>
-        <parameterName value="?log_level" />
-        <dbType value="String" />
-        <size value="50" />
-        <layout type="log4net.Layout.PatternLayout">
-          <conversionPattern value="%level" />
-        </layout>
-      </parameter>
-
-      <parameter>
-        <parameterName value="?message" />
-        <dbType value="String" />
-        <size value="4000" />
-        <layout type="log4net.Layout.PatternLayout">
-          <conversionPattern value="%message" />
-        </layout>
-      </parameter>
-      <filter type="log4net.Filter.LevelMatchFilter">
-        <levelToMatch value="DEBUG" />
-      </filter>
-      <filter type="log4net.Filter.DenyAllFilter" />
-    </appender>-->
-    
-    
-    <root>
-      <!--(高) OFF > FATAL > ERROR > WARN > INFO > DEBUG > ALL (低)-->
-      <level value="ALL" />
-      <appender-ref ref="InfoLogFileAppender" />
-      <appender-ref ref="RollingLogFileAppender" />
-      <appender-ref ref="AdoNetAppender" />
-    </root>
-  </log4net>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-1.5.2.14234" newVersion="1.5.2.14234" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Common.Logging.Core" publicKeyToken="af08829b84f0328e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
-      </dependentAssembly>
-      
-      <dependentAssembly>
-        <assemblyIdentity name="Common.Logging" publicKeyToken="af08829b84f0328e" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.3.1.0" newVersion="3.3.1.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="log4net" publicKeyToken="669e0ddf0bb1aa2a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.8.0" newVersion="2.0.8.0" />
-      </dependentAssembly>
-      
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
-      </dependentAssembly>
-      
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.0.0.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-  <system.codedom>
-    <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
-    </compilers>
-  </system.codedom>
-</configuration>
\ No newline at end of file
diff --git a/Reportapi/MyCode.Project.WebApi/packages.config b/Reportapi/MyCode.Project.WebApi/packages.config
index 0954894..2c0fffa 100644
--- a/Reportapi/MyCode.Project.WebApi/packages.config
+++ b/Reportapi/MyCode.Project.WebApi/packages.config
@@ -29,6 +29,7 @@
   <package id="Microsoft.Net.Compilers" version="1.3.2" targetFramework="net462" developmentDependency="true" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
   <package id="Modernizr" version="2.6.2" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
   <package id="Respond" version="1.2.0" targetFramework="net462" />
   <package id="Senparc.CO2NET" version="0.4.4" targetFramework="net461" />
   <package id="Senparc.CO2NET.APM" version="0.2.2" targetFramework="net461" />
diff --git a/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config b/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
index 65eb285..abf946a 100644
--- a/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
+++ b/Reportapi/MyCode.Project.ZHMDGenerateCode/App.config
@@ -104,7 +104,7 @@
      
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
diff --git a/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj b/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj
index 573a7c5..0b8deef 100644
--- a/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj
+++ b/Reportapi/MyCode.Project.ZHMDGenerateCode/MyCode.Project.ZHMDGenerateCode.csproj
@@ -8,7 +8,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>MyCode.Project.GenerateCode</RootNamespace>
     <AssemblyName>MyCode.Project.GenerateCode</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />