临时提交

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ.DAL/SqlServer.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
+using System.Linq.Expressions;
 using SCADA.CommonLib;
 using SCADA.CommonLib.Data;
 using SCADA.CommonLib.Data.DIL;

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/Models/Statistics/StatisticsDBModel.cs

@@ -1,4 +1,5 @@
 using SCADA.CommonLib;
+using SqlSchema.DBNames;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,6 +15,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 类型
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Source_Str)]
         public string Source
         {
             get { return _Source; }
@@ -32,6 +34,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 激光机
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_1_Int)]
         public int Mac_1Value
         {
             get { return _Mac_1Value; }
@@ -50,6 +53,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 西门子plc
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_2_Int)]
         public int Mac_2Value
         {
             get { return _Mac_2Value; }
@@ -68,6 +72,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 倍福
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_3_Int)]
         public int Mac_3Value
         {
             get { return _Mac_3Value; }
@@ -86,6 +91,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 百超折弯
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_4_Int)]
         public int Mac_4Value
         {
             get { return _Mac_4Value; }
@@ -104,6 +110,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 一号折弯机
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_5_Int)]
         public int Mac_5Value
         {
             get { return _Mac_5Value; }
@@ -122,6 +129,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 二号折弯机
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_6_Int)]
         public int Mac_6Value
         {
             get { return _Mac_6Value; }
@@ -140,6 +148,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// PBC折弯机
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_7_Int)]
         public int Mac_7Value
         {
             get { return _Mac_7Value; }
@@ -158,6 +167,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 三号折弯机
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_8_Int)]
         public int Mac_8Value
         {
             get { return _Mac_8Value; }
@@ -176,6 +186,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 高机冲孔机
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_9_Int)]
         public int Mac_9Value
         {
             get { return _Mac_9Value; }
@@ -194,6 +205,7 @@ namespace SCADA_DAQ.Customer.Models.Statistics
         /// <summary>
         /// 金方圆冲孔机
         /// </summary>
+        [Column(T_Col_Name.App_Vertiv_Statistics.Mac_10_Int)]
         public int Mac_10Value
         {
             get { return _Mac_10Value; }

skoda-scada-daq3.0-master/skoda-scada-daq3.0-master/scada_-daq3.0-master/SCADA_DAQ/Customer/Service/CustomerService.cs

@@ -56,21 +56,21 @@ namespace SCADA_DAQ.Customer.Service
         public FXMachine BystronicMac { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("百超折弯机");
 
 
-        public FXMachine BendMac_1 { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("一号YaWei折弯机");
+        public FXMachine BendMac_1 { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("1号YaWei折弯机");
 
 
-        public FXMachine BendMac_2 { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("二号YaWei折弯机");
+        public FXMachine BendMac_2 { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("2号YaWei折弯机");
 
 
         public FXMachine PbcBendMac { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("亚威PBC折弯机");
 
 
-        public FXMachine BendMac_3 { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("三号YaWei折弯机");
+        public FXMachine BendMac_3 { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("3号YaWei折弯机");
 
 
         public FXMachine GaojiCisailleMac { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("高机母线冲剪机");
 
-        public FXMachine JinfangyuanCisailleMac { get; set; } = MachineServer.GetInstance().GetMachine<FXMachine>("金方圆数控母线冲剪机");
+        public SampleMachine JinfangyuanCisailleMac { get; set; } = MachineServer.GetInstance().GetMachine<SampleMachine>("金方圆数控母线冲孔机");