Merge branch 'dep_yangw' of http://175.27.215.92:3000/yangw/ProductionSystem into dep_yangw

ProductionSystem_Model/DbModel/T_Product_Step.cs

@@ -0,0 +1,36 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProductionSystem_Model.DbModel
+{
+    /// <summary>
+    /// 产品步骤
+    /// </summary>
+    public class T_Product_Step
+    {
+        [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        public int Id { get; set; }
+
+        [SugarColumn(ColumnName = "step_name")]
+        public string StepName { get; set; }
+
+        [SugarColumn(ColumnName = "equipment_name")]
+        public string EquipmentName { get; set; }
+
+        [SugarColumn(ColumnName = "write_value")]
+        public string WriteValue { get; set; }
+
+        [SugarColumn(ColumnName = "return_value")]
+        public string ReturnValue { get; set; }
+
+        [SugarColumn(ColumnName = "createdtime")]
+        public DateTime CreateTime { get; set; }
+
+        [SugarColumn(ColumnName = "product_type")]
+        public string ProductType { get; set; }
+    }
+}

ProductionSystem_Model/ProductionSystem_Model.csproj

@@ -113,6 +113,7 @@
     <Compile Include="DbModel\T_Data_Product.cs" />
     <Compile Include="DbModel\T_PlcPoint.cs" />
     <Compile Include="DbModel\T_ProductType.cs" />
+    <Compile Include="DbModel\T_Product_Step.cs" />
     <Compile Include="DbModel\T_Result.cs" />
     <Compile Include="DbModel\Ux.cs" />
     <Compile Include="Enum\ColorEnum.cs" />

ProductionSystem_Service/ProductStepService.cs

@@ -0,0 +1,30 @@
+using ProductionSystem_Log;
+using ProductionSystem_Model.DbModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProductionSystem_Service
+{
+    public class ProductStepService : DbContext
+    {
+        /// <summary>
+        /// 新增产品步骤内容
+        /// </summary>
+        /// <param name="t_Product_Step"></param>
+        /// <returns></returns>
+        public int AddProductStep(T_Product_Step t_Product_Step)
+        {
+            try
+            {
+                return db.Insertable(t_Product_Step).ExecuteCommand();
+            }catch (Exception ex)
+            {
+                LogHelper.Error(ex, "执行ProductStepService下AddProductStep时异常");
+                return -1;
+            }
+        }
+    }
+}

ProductionSystem_Service/ProductionSystem_Service.csproj

@@ -111,6 +111,7 @@
     <Compile Include="ParaColumnConfigService.cs" />
     <Compile Include="ParaConfigService.cs" />
     <Compile Include="PlcPointService.cs" />
+    <Compile Include="ProductStepService.cs" />
     <Compile Include="ProductTypeService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="DicTypeService.cs" />