michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workflow used in DataEntry.S620, LaserMarking stored to WaterMeter.Remark.

Browse Source
This commit is contained in:
Milan Hanajik
2021-11-18 14:54:03 +01:00
parent 351157dbba
commit 09a0968b76
5 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Results/BatchResults.cs
+18 -13
View File
@@ -44,7 +44,8 @@ namespace Results
public static BatchResults NewFromProcedure(int batchNr, int benchId, string benchName, string a1, string a2, string a3, string a4, string a5,
string user, int userNr, string programVer, Config.Entities.Procedure procedure,
WaterMeterData[] waterMeterDatas, int[] waterMeterParts, string variant, string order, string workflow,
WaterMeterData[] waterMeterDatas, int[] waterMeterParts,
string variant, string order, string workflow, string laserMarking,
double realDensity, double atTemperature, double buoyancy)
{
BatchResults d = new BatchResults(waterMeterDatas.Length);
@@ -86,23 +87,27 @@ namespace Results
///
for (int wmPos0 = 0; wmPos0 < d.WMPositionsCount; wmPos0++)
{
if (waterMeterDatas[wmPos0] == null)
var wm = new WaterMeter()
{
d.Batch.WaterMeters.Add(new WaterMeter() { Batch = d.Batch,
WaterMeterData = null,
WMPosition = wmPos0 + 1,
YearOfProduction = year,
Disabled = true, });
Batch = d.Batch,
WMPosition = wmPos0 + 1,
YearOfProduction = year,
};
if (waterMeterDatas[wmPos0] != null)
{
wm.WaterMeterData = WaterMeterData.UpdateList(d.WaterMeterDataList, waterMeterDatas[wmPos0]);
}
else
{
WaterMeterData wmd = WaterMeterData.UpdateList(d.WaterMeterDataList, waterMeterDatas[wmPos0]);
d.Batch.WaterMeters.Add(new WaterMeter() { Batch = d.Batch,
WaterMeterData = wmd,
WMPosition = wmPos0 + 1,
YearOfProduction = year, });
wm.Disabled = true;
}
}
if (!string.IsNullOrEmpty(order)) wm.PurchaseOrder = order;
if (!string.IsNullOrEmpty(laserMarking)) wm.Remark = laserMarking;
d.Batch.WaterMeters.Add(wm);
}
foreach (var ti in procedure.GetTestInstances())
{