yangw
/
lj_plc
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dep' of http://175.27.215.92:3000/yangw/lj_plc into dep

Browse Source
wangsr
wangsr 1 year ago
parent 2a39faf545 bb594c19b0
commit 9b31b74429
5 changed files with 153 additions and 25 deletions
Show Stats Download Patch File Download Diff File

4
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/DeviceMaterrial.cs
Unescape Escape View File

@ -35,7 +35,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
{
public void Save(List<DeviceMaterrial> materrials)
public static void Save(List<DeviceMaterrial> materrials)
{
var deviceMaterrial = materrials.First();
@ -47,7 +47,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
}
public List<DeviceMaterrial> GetByTypeId(int type, int deviceId)
public static List<DeviceMaterrial> GetByTypeId(int type, int deviceId)
{
return FreeSqlUnit.Instance.Select<DeviceMaterrial>()
.Where(x => x.Type == type && x.DeviceId == deviceId)

8
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/AutoControl/DB/StockMaterrialDBHelp.cs
Unescape Escape View File

@ -15,7 +15,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
/// 获取干混机物料
/// </summary>
/// <returns></returns>
public List<MyNameValue> GetDryerMaterrial()
public static List<MyNameValue> GetDryerMaterrial()
{
var list = GetStockMaterrial(1);
list.RemoveAll(x => x.Id == 5);
@ -27,7 +27,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
/// 获取糊化机物料
/// </summary>
/// <returns></returns>
public List<MyNameValue> GetSiloMaterrial()
public static List<MyNameValue> GetSiloMaterrial()
{
var list1 = GetStockMaterrial(1);
list1 = list1.Where(x => x.Id == 5 || x.Id == 6).ToList();
@ -40,7 +40,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
/// <param name="id"></param>
/// <returns></returns>
public int GetCodeById(int id)
public static int GetCodeById(int id)
{
string sql = $"select Code from lj_stock_material where Id={id}";
var dataTable = DBHelp.GetTable(sql);
@ -50,7 +50,7 @@ namespace Mesnac.Action.ChemicalWeighing.AutoControl.DB
private List<MyNameValue> GetStockMaterrial(int mtypId)
private static List<MyNameValue> GetStockMaterrial(int mtypId)
{
string sql = "select Id, Code, StockName, MTypeId, MTypeName, MId, MName, Remark from lj_stock_material";

3
Actions/ChemicalWeighing/Mesnac.Action.ChemicalWeighing/Mesnac.Action.ChemicalWeighing.csproj
Unescape Escape View File

@ -176,6 +176,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\PlugInPlatform\Mesnac.PlugIn.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Office.Interop.Excel">
<HintPath>..\..\Microsoft.Office.Interop.Excel.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />

4
DataBlockHelper/DBHelpers/DB2105Helper.cs
Unescape Escape View File

@ -54,7 +54,7 @@ namespace DataBlockHelper.DBHelpers
List<NoVal> ls = new List<NoVal>();
var b = bytes.Skip(53).Take(1).First();
for (int i = 0; i <4; i++)
for (int i = 0; i <8; i++)
{
int no = i + 1;
ls.Add(new NoVal()
@ -88,7 +88,7 @@ namespace DataBlockHelper.DBHelpers
int start = 54;
List<SetValue> ls = new List<SetValue>();
for (int i = 0; i < 8; i++)
for (int i = 0; i < 4; i++)
{
int no = i + 1;
var b = bytes.Skip(start).Take(8).ToArray();

157
DataBlockHelper/DBHelpers/DB2105WriteHelper.cs
Unescape Escape View File

@ -8,47 +8,172 @@ namespace DataBlockHelper.DBHelpers
public static void WriteStartJob1()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.0",true);
}
public static void WriteStopJob1()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.0",false);
}
public static void WriteSetValueH1(SetValue setValue)
public static void WriteStartJob2()
{
WriteSetValue(54, setValue);
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.1",true);
}
public static void WriteSetValueH2(SetValue setValue)
public static void WriteStopJob2()
{
WriteSetValue(62, setValue);
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.1",false);
}
public static void WriteSetValueH3(SetValue setValue)
public static void WriteStartJob3()
{
WriteSetValue(70, setValue);
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.2",true);
}
public static void WriteSetValueH4(SetValue setValue)
public static void WriteStopJob3()
{
WriteSetValue(78, setValue);
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.2",false);
}
public static void WriteSetValueH5(SetValue setValue)
public static void WriteStartJob4()
{
WriteSetValue(86, setValue);
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.3",true);
}
public static void WriteSetValueH6(SetValue setValue)
public static void WriteStopJob4()
{
WriteSetValue(86, setValue);
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.3",false);
}
public static void WriteSetValueH7(SetValue setValue)
public static void WriteStartJob5()
{
WriteSetValue(94, setValue);
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.4",true);
}
public static void WriteSetValueH8(SetValue setValue)
public static void WriteStopJob5()
{
WriteSetValue(102, setValue);
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.4",false);
}
public static void WriteStartJob6()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.5",true);
}
public static void WriteStopJob6()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.5",false);
}
public static void WriteStartJob7()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.6",true);
}
public static void WriteStopJob7()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.6",false);
}
public static void WriteStartJob8()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.7",true);
}
public static void WriteStopJob8()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:52.7",false);
}
public static void WriteManScrewH1()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:53.0",true);
}
public static void WriteManScrewH2()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:53.1",true);
}
public static void WriteManScrewH3()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:53.2",true);
}
public static void WriteManScrewH4()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:53.3",true);
}
public static void WriteManScrewH5()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:53.4",true);
}
public static void WriteManScrewH6()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:53.5",true);
}
public static void WriteManScrewH7()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:53.6",true);
}
public static void WriteManScrewH8()
{
var siemensS7Net = PlcConnect.Instance;
siemensS7Net.Write($"{DbName}:53.7",true);
}
public static void WriteSetValueH1(SetValue setValue)
{
WriteSetValue(54, setValue);
}
public static void WriteSetValueH2(SetValue setValue)
{
WriteSetValue(62, setValue);
}
public static void WriteSetValueH3(SetValue setValue)
{
WriteSetValue(70, setValue);
}
public static void WriteSetValueH4(SetValue setValue)
{
WriteSetValue(78, setValue);
}
private static void WriteSetValue(int start,SetValue setValue)
{

Write Preview
Loading…
Cancel
Save