From 80b7eb2ef09ca1ef514ea750abbc07a92968efcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=91=E5=8F=AB=E9=94=84=E5=A4=B4?= <nodyang@qq.com>
Date: Tue, 5 Dec 2023 18:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=BF=E6=B7=B7=E6=9C=BA=20=E5=B9=B2?=
 =?UTF-8?q?=E6=B7=B7=E6=9C=BA=20=E7=B3=8A=E5=8C=96=E6=9C=BA=E5=AE=9E?=
 =?UTF-8?q?=E4=BD=93=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FreeDb/DBEntity/Report/Report_Dry.cs      | 73 ++++++++++++++++
 .../DBEntity/Report/Report_DryDos_Detail.cs   | 69 +++++++++++++++
 .../DBEntity/Report/Report_DryMixer_Detail.cs | 75 ++++++++++++++++
 .../FreeDb/DBEntity/Report/Report_Gel.cs      | 45 ++++++++++
 .../DBEntity/Report/Report_GelDoser_Detail.cs | 85 +++++++++++++++++++
 .../Report/Report_GelMixing_Detail.cs         | 75 ++++++++++++++++
 .../FreeDb/DBEntity/Report/Report_WetMixer.cs | 76 +++++++++++++++++
 .../DBEntity/Report/Report_WetMixer_Detail.cs | 85 +++++++++++++++++++
 .../Mesnac.Action.ChemicalWeighing.csproj     |  8 ++
 9 files changed, 591 insertions(+)
 create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_Dry.cs
 create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_DryDos_Detail.cs
 create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_DryMixer_Detail.cs
 create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_Gel.cs
 create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelDoser_Detail.cs
 create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelMixing_Detail.cs
 create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_WetMixer.cs
 create mode 100644 Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_WetMixer_Detail.cs

diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_Dry.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_Dry.cs
new file mode 100644
index 0000000..5473141
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_Dry.cs
@@ -0,0 +1,73 @@
+using FreeSql.DataAnnotations;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity
+{
+    /// <summary>
+    /// 干混机报表
+    /// </summary>
+
+    public partial class Report_Dry
+    {
+
+        /// <summary>
+        /// 主键标识
+        /// </summary>
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 车次
+        /// </summary>
+
+        public int? Batch { get; set; }
+
+        /// <summary>
+        /// 是第几台干混机
+        /// </summary>
+
+        public int? dryNo { get; set; }
+
+        /// <summary>
+        /// 计划编码
+        /// </summary>
+
+        public int? planCode { get; set; }
+
+        /// <summary>
+        /// 计划名称
+        /// </summary>
+        [Column(DbType = "nvarchar(50)")]
+        public string planName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+
+        public int? recipeCode { get; set; }
+
+        /// <summary>
+        /// 配方名称
+        /// </summary>
+        [Column(DbType = "nvarchar(50)")]
+        public string recipeName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+
+        public DateTime? recordTime { get; set; }
+
+        /// <summary>
+        /// 报表标识
+        /// </summary>
+        [Column(DbType = "varchar(36)")]
+        public string reportId { get; set; } = string.Empty;
+
+    }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_DryDos_Detail.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_DryDos_Detail.cs
new file mode 100644
index 0000000..c9ecb87
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_DryDos_Detail.cs
@@ -0,0 +1,69 @@
+using FreeSql.DataAnnotations;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report
+{
+    public partial class Report_DryDos_Detail
+    {
+
+        /// <summary>
+        /// 主键
+        /// </summary>
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 实际公差
+        /// </summary>
+
+        public double? actToler { get; set; }
+
+        /// <summary>
+        /// 实际重量
+        /// </summary>
+
+        public double? actValue { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+
+        public int? batch { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+
+        public int? eqNo { get; set; }
+
+        /// <summary>
+        /// 物料代码
+        /// </summary>
+
+        public int? matCode { get; set; }
+
+
+        public DateTime? recordTime { get; set; }
+
+        [Column(DbType = "varchar(36)")]
+        public string reportId { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 设定公差
+        /// </summary>
+
+        public double? setToler { get; set; }
+
+        /// <summary>
+        /// 设定重量
+        /// </summary>
+
+        public double? setValue { get; set; }
+
+    }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_DryMixer_Detail.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_DryMixer_Detail.cs
new file mode 100644
index 0000000..6cae447
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_DryMixer_Detail.cs
@@ -0,0 +1,75 @@
+using FreeSql.DataAnnotations;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report
+{
+    public partial class Report_DryMixer_Detail
+    {
+
+        /// <summary>
+        /// 主键标识
+        /// </summary>
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 动作
+        /// </summary>
+
+        public double? actCode { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+
+        public int? eqNo { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+
+        public int? mixBatch { get; set; }
+
+        /// <summary>
+        /// 速度
+        /// </summary>
+
+        public double? mixSpeed { get; set; }
+
+        /// <summary>
+        /// 步号
+        /// </summary>
+
+        public int? mixStep { get; set; }
+
+        /// <summary>
+        /// 温度
+        /// </summary>
+
+        public double? mixTemp { get; set; }
+
+        /// <summary>
+        /// 时间
+        /// </summary>
+
+        public double? mixTime { get; set; }
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+
+        public DateTime? recordTime { get; set; }
+
+        /// <summary>
+        /// 报表标识
+        /// </summary>
+        [Column(DbType = "varchar(36)")]
+        public string reportId { get; set; } = string.Empty;
+
+    }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_Gel.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_Gel.cs
new file mode 100644
index 0000000..d428113
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_Gel.cs
@@ -0,0 +1,45 @@
+using FreeSql.DataAnnotations;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report
+{
+    public partial class Report_Gel
+    {
+
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 车次
+        /// </summary>
+
+        public int? Batch { get; set; }
+
+
+        public int? gelNo { get; set; }
+
+
+        public int? planCode { get; set; }
+
+        [Column(DbType = "nvarchar(50)")]
+        public string planName { get; set; } = string.Empty;
+
+
+        public int? recipeCode { get; set; }
+
+        [Column(DbType = "nvarchar(50)")]
+        public string recipeName { get; set; } = string.Empty;
+
+
+        public DateTime? recordTime { get; set; }
+
+        [Column(DbType = "varchar(36)")]
+        public string reportId { get; set; } = string.Empty;
+
+    }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelDoser_Detail.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelDoser_Detail.cs
new file mode 100644
index 0000000..433a192
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelDoser_Detail.cs
@@ -0,0 +1,85 @@
+using FreeSql.DataAnnotations;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report
+{
+    /// <summary>
+    /// 干混机报表
+    /// </summary>
+
+    public partial class Report_GelDoser_Detail
+    {
+
+        /// <summary>
+        /// 主键标识
+        /// </summary>
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 实际公差
+        /// </summary>
+
+        public double? actToLer { get; set; }
+
+        /// <summary>
+        /// 实际重量
+        /// </summary>
+
+        public double? actValue { get; set; }
+
+        /// <summary>
+        /// 批次号
+        /// </summary>
+
+        public int? batch { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+
+        public int? eqNo { get; set; }
+
+        /// <summary>
+        /// 1 糊化机 2  hotWater 3 coolWater
+        /// </summary>
+
+        public int? kinds { get; set; }
+
+        /// <summary>
+        /// 物料代码
+        /// </summary>
+
+        public int? matCode { get; set; }
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+
+        public DateTime? recordTime { get; set; }
+
+        /// <summary>
+        /// 报表标识
+        /// </summary>
+        [Column(DbType = "varchar(36)")]
+        public string reportId { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 设定公差
+        /// </summary>
+
+        public double? setToler { get; set; }
+
+        /// <summary>
+        /// 设定重量
+        /// </summary>
+
+        public double? setValue { get; set; }
+
+    }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelMixing_Detail.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelMixing_Detail.cs
new file mode 100644
index 0000000..bb63b51
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_GelMixing_Detail.cs
@@ -0,0 +1,75 @@
+using FreeSql.DataAnnotations;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report
+{
+    public partial class Report_GelMixing_Detail
+    {
+
+        /// <summary>
+        /// 主键标识
+        /// </summary>
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 动作
+        /// </summary>
+
+        public int? actCode { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+
+        public int? eqNo { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+
+        public int? mixBatch { get; set; }
+
+        /// <summary>
+        /// 速度
+        /// </summary>
+
+        public double? mixSpeed { get; set; }
+
+        /// <summary>
+        /// 步号
+        /// </summary>
+
+        public int? mixStep { get; set; }
+
+        /// <summary>
+        /// 温度
+        /// </summary>
+
+        public double? mixTemp { get; set; }
+
+        /// <summary>
+        /// 时间
+        /// </summary>
+
+        public int? mixTime { get; set; }
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+
+        public DateTime? recordTime { get; set; }
+
+        /// <summary>
+        /// 报表标识
+        /// </summary>
+        [Column(DbType = "varchar(36)")]
+        public string reportId { get; set; } = string.Empty;
+
+    }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_WetMixer.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_WetMixer.cs
new file mode 100644
index 0000000..540fd3f
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_WetMixer.cs
@@ -0,0 +1,76 @@
+using FreeSql.DataAnnotations;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report
+{
+    /// <summary>
+    /// 干混机报表
+    /// </summary>
+
+    public partial class Report_WetMixer
+    {
+
+        /// <summary>
+        /// 主键标识
+        /// </summary>
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 车次
+        /// </summary>
+
+        public int? Batch { get; set; }
+
+        /// <summary>
+        /// 计划代码
+        /// </summary>
+
+        public int? planCode { get; set; }
+
+        /// <summary>
+        /// 计划名称
+        /// </summary>
+        [Column(DbType = "nvarchar(50)")]
+        public string planName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 配方编码
+        /// </summary>
+
+        public int? recipeCode { get; set; }
+
+        /// <summary>
+        /// 配方名称
+        /// </summary>
+        [Column(DbType = "nvarchar(50)")]
+        public string recipeName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+
+        public DateTime? recordTime { get; set; }
+
+        /// <summary>
+        /// 报表标识
+        /// </summary>
+        [Column(DbType = "varchar(36)")]
+        public string reportId { get; set; } = string.Empty;
+
+
+        public DateTime? reportTime { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+
+        public int? WetNo { get; set; }
+
+    }
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_WetMixer_Detail.cs b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_WetMixer_Detail.cs
new file mode 100644
index 0000000..76de7ce
--- /dev/null
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/FreeDb/DBEntity/Report/Report_WetMixer_Detail.cs
@@ -0,0 +1,85 @@
+using FreeSql.DataAnnotations;
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mesnac.Action.ChemicalWeighing.FreeDb.DBEntity.Report
+{
+    public partial class Report_WetMixer_Detail
+    {
+
+        /// <summary>
+        /// 主键标识
+        /// </summary>
+        [Column(IsPrimary = true, IsIdentity = true)]
+        public int objId { get; set; }
+
+        /// <summary>
+        /// 动作
+        /// </summary>
+
+        public int? actCode { get; set; }
+
+
+        public double? actTolerence { get; set; }
+
+        /// <summary>
+        /// mix编号
+        /// </summary>
+
+        public double? actWeight { get; set; }
+
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+
+        public int? eqNo { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+
+        public int? mixBatch { get; set; }
+
+        /// <summary>
+        /// 速度
+        /// </summary>
+
+        public double? mixSpeed { get; set; }
+
+        /// <summary>
+        /// 步号
+        /// </summary>
+
+        public int? mixStep { get; set; }
+
+        /// <summary>
+        /// 温度
+        /// </summary>
+
+        public double? mixTemp { get; set; }
+
+        /// <summary>
+        /// 时间
+        /// </summary>
+
+        public int? mixTime { get; set; }
+
+        /// <summary>
+        /// 记录时间
+        /// </summary>
+
+        public DateTime? recordTime { get; set; }
+
+        /// <summary>
+        /// 报表标识
+        /// </summary>
+        [Column(DbType = "varchar(36)")]
+        public string reportId { get; set; } = string.Empty;
+
+    }
+
+}
diff --git a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
index 7ecc46c..8dca538 100644
--- a/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
+++ b/Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
@@ -275,6 +275,14 @@
     <Compile Include="FreeDb\DBEntity\LjFormulaDetailEntity.cs" />
     <Compile Include="FreeDb\DBEntity\LjFormulaEntity.cs" />
     <Compile Include="FreeDb\DBEntity\LjPlanningEntity.cs" />
+    <Compile Include="FreeDb\DBEntity\Report\Report_Dry.cs" />
+    <Compile Include="FreeDb\DBEntity\Report\Report_DryDos_Detail.cs" />
+    <Compile Include="FreeDb\DBEntity\Report\Report_DryMixer_Detail.cs" />
+    <Compile Include="FreeDb\DBEntity\Report\Report_Gel.cs" />
+    <Compile Include="FreeDb\DBEntity\Report\Report_GelDoser_Detail.cs" />
+    <Compile Include="FreeDb\DBEntity\Report\Report_GelMixing_Detail.cs" />
+    <Compile Include="FreeDb\DBEntity\Report\Report_WetMixer.cs" />
+    <Compile Include="FreeDb\DBEntity\Report\Report_WetMixer_Detail.cs" />
     <Compile Include="FreeDb\FreeSqlUnit.cs" />
     <Compile Include="InterfaceDocking\DockingEntity\JsonReturnEntity.cs" />
     <Compile Include="InterfaceDocking\DockingEntity\MaterialPlanSyncEntity.cs" />