Commit 36c81e1c authored by 潘栩锋's avatar 潘栩锋 🚴

删除了 BulkData 代码整理

parent 46323b10
......@@ -118,10 +118,6 @@
<Project>{91a1aafe-a528-4c2e-a48a-9259e780255a}</Project>
<Name>FLY.Thick.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.FLY.Thick.BulkData\FLY.Thick.BulkData\FLY.Thick.BulkDataModule.csproj">
<Project>{2f88b5ec-85bc-4b5e-b254-06d2f2771f67}</Project>
<Name>FLY.Thick.BulkDataModule</Name>
</ProjectReference>
<ProjectReference Include="..\..\thick_public\Project.SQLiteHelper\SQLiteHelper\SQLiteHelper.csproj">
<Project>{4CBABFAA-1C62-4510-AC63-A51EE5FD50FF}</Project>
<Name>SQLiteHelper</Name>
......
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Reflection;
using System.IO;
using System.Net;
using System.Diagnostics;
using System.ComponentModel;
using Misc;
using FObjBase;
using FlyADBase;
using FLY.Thick.Base.Common;
using FLY.Thick.Base.IService;
using FLY.Thick.Base.Common;
using FLY.Thick.Base.Server;
using FLY.Thick.RemoteHistory;
using FLY.Thick.BulkDataModule;
using FLY.Thick.Blowing.Server.Model;
using FlyADBase;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.IO;
using System.Threading.Tasks;
namespace FLY.Thick.Blowing.Server
......@@ -148,7 +138,7 @@ namespace FLY.Thick.Blowing.Server
#region create
sysParam = new SysParam(null);//系统参数
profile = new BlowingFixProfile(null);//运行配置参数
curve = new CurveCollection(null);//AD转thick
......@@ -203,9 +193,9 @@ namespace FLY.Thick.Blowing.Server
{
dynArea.Target = (int)(profile.Param.Target * 100);
});
Misc.BindingOperations.SetBinding(profile.Param, new string[] { "Target", "TolerancePercent" }, () =>
Misc.BindingOperations.SetBinding(profile.Param, new string[] { "Target", "TolerancePercent" }, () =>
{
dynArea.Alarm = (int)(profile.Param.Target * profile.Param.TolerancePercent * 100 );
dynArea.Alarm = (int)(profile.Param.Target * profile.Param.TolerancePercent * 100);
});
Misc.BindingOperations.SetBinding(profile.Param, "K", dynArea, "Comp");
......@@ -256,7 +246,7 @@ namespace FLY.Thick.Blowing.Server
//---------------------------------------------------------------------------------------------------------------
//ScanWarning_Create
scanWarning.Init(warning,historyDb);
scanWarning.Init(warning, historyDb);
......@@ -266,7 +256,7 @@ namespace FLY.Thick.Blowing.Server
gmFix.Init(dynArea, AD2Thick);
gmFix.IsIgnoreDataWhenIdle = false;
gmManager.AddGM(gmFix);
//---------------------------------------------------------------------------------------------------------------
//GM_RenZiJiaFix_Create
......@@ -278,7 +268,7 @@ namespace FLY.Thick.Blowing.Server
//Bulkdate_Create
//gmRenZiJiaFix.Init(Ad2Thk, dynArea, profile.Param, historyDb,orgHistoryDb, bulkDb );
gmRenZiJiaFix.Init(Ad2Thk, dynArea, profile.Param, historyDb, bulkDb);
......@@ -363,7 +353,7 @@ namespace FLY.Thick.Blowing.Server
{
errno = FLY.Thick.Blowing.Common.ERRNOs.BASE_ERRNO_AD_MIN,
cnt = 20,
conditional = delegate()
conditional = delegate ()
{
return dynArea.AD < (dynArea.ADMax * 0.01);
}
......@@ -374,7 +364,7 @@ namespace FLY.Thick.Blowing.Server
{
errno = FLY.Thick.Blowing.Common.ERRNOs.BASE_ERRNO_AD_MAX,
cnt = 20,
conditional = delegate()
conditional = delegate ()
{
return (dynArea.AD > (dynArea.ADMax * 0.98));
}
......@@ -512,7 +502,7 @@ namespace FLY.Thick.Blowing.Server
if (Misc.MyBase.ISVALIDATA(ad))
{
thick = curve.AD2Value(ad, AD2ValueFlag.Revised);
thick = (int)(thick * profile.Param.K);
}
return thick;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment