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

Purchase Order - Collector complete, bug fix in entities version 3.9.2149.11

Browse Source
This commit is contained in:
Michal Buzik 2024-09-02 14:21:40 +02:00
parent 57c2019405
commit 77d8c95930
7 changed files with 83 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Results/Entities/PurchaseBox.cs
View File

@ -15,6 +15,18 @@ namespace Results.Entities
PurchaseWaterMeterDataList = new List<PurchaseWaterMeterData>();
}
public PurchaseBox(string boxNo, PurchaseOrder purchaseOrder)
{
PurchaseWaterMeterDataList = new List<PurchaseWaterMeterData>();
BoxNo = boxNo;
PurchaseOrder = purchaseOrder;
}
/// <summary>
/// constructor
/// </summary>
/// <param name="boxNo"></param>
/// <param name="boxDataId">unused now</param>
/// <param name="purchaseOrder"></param>
public PurchaseBox(string boxNo, int boxDataId, PurchaseOrder purchaseOrder)
{
PurchaseWaterMeterDataList = new List<PurchaseWaterMeterData>();

33
Results/Entities/PurchaseEntities/ImportPurchaseOrderTestData.sql Normal file
View File

@ -0,0 +1,33 @@
insert into 'wrcswindon298-r'.purchase_orderdata (Id, PurchaseOrder)
values (1, 'Order 123'),
(2, 'Order 124'),
(3, 'Order 125');
insert into 'wrcswindon298-r'.purchase_boxdata (Id, BoxNo, PurchaseOrderId)
values (2, 'B 001', 3),
(3, 'B 002', 2),
(4, 'B 003', 1),
(5, 'B 011', 3),
(6, 'B 012', 2),
(7, 'B 013', 1);
insert into 'wrcswindon298-r'.purchase_watermeterdata (Id, SerialNo, WaterMeterData_id, PurchaseBoxId)
values (2, 'SN-123456-1', null, 2),
(3, 'SN_123456-2', null, 2),
(4, 'SN_123456-3', null, 2),
(5, 'SN_123456-4', null, 2),
(6, 'SN_132456-5', null, 2),
(7, 'SN_123456-6', null, 2),
(8, 'SN-123457-1', null, 5),
(9, 'SN_123457-2', null, 5),
(10, 'SN_123457-3', null, 5),
(11, 'SN_123457-4', null, 5),
(12, 'SN_132457-5', null, 5),
(13, 'SN_123457-6', null, 5),
(14, 'SN-1234-1', null, 2),
(15, 'SN_1234-2', null, 3),
(16, 'SN_1234-3', null, 4),
(17, 'SN_1234-4', null, 5),
(18, 'SN_1324-5', null, 6),
(19, 'SN_1234-6', null, 7);

1
Results/Results.csproj
View File

@ -253,6 +253,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Entities\PurchaseEntities\createPurchaseTables.sql" />
<Content Include="Entities\PurchaseEntities\ImportPurchaseOrderTestData.sql" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

1
TBF.sln
View File

@ -135,6 +135,7 @@ Global
{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|x86.ActiveCfg = Release|Any CPU
{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9D0DCC88-DC81-47EB-9FDD-4C3907871BFB}.Release|Any CPU.Build.0 = Release|Any CPU
{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{743DF7DB-C7B6-42EB-986D-0F485E5588E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU

4
TBF/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.9.2142.9")]
[assembly: AssemblyFileVersion("3.9.2142.9")]
[assembly: AssemblyVersion("3.9.2142.11")]
[assembly: AssemblyFileVersion("3.9.2142.11")]

35
TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleBeginningForm.cs
View File

@ -25,7 +25,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
/// To be retrieved after the form is closed
public string PurchaseOrder;
private IList<PurchaseOrder> purchaseOrderListExample;
private List<PurchaseOrder> purchaseOrderListExample;
public string[] SNText;
public bool[] Disabled;
@ -1349,12 +1349,43 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
if (orders != null)
{
purchaseOrderListExample = orders;
CopyPurchaseOrderList(ref purchaseOrderListExample, orders);
}
}
}
private void CopyPurchaseOrderList(ref List<PurchaseOrder> purchaseOrders, IList<PurchaseOrder> orders)
{
purchaseOrders?.Clear();
if (purchaseOrders == null)
{
purchaseOrders = new List<PurchaseOrder>();
}
foreach (var order in orders)
{
PurchaseOrder orderCopy = new PurchaseOrder(order.Name);
foreach (PurchaseBox box in order.PurchaseBoxList)
{
PurchaseBox boxCopy = new PurchaseBox(box.BoxNo, box.PurchaseOrder);
foreach (PurchaseWaterMeterData waterMeter in box.PurchaseWaterMeterDataList)
{
PurchaseWaterMeterData waterMeterCopy =
new PurchaseWaterMeterData(waterMeter.SerialNo, boxCopy);
boxCopy.PurchaseWaterMeterDataList.Add(waterMeterCopy);
}
orderCopy.PurchaseBoxList.Add(boxCopy);
}
purchaseOrders.Add(orderCopy);
}
}
private void InitExamplePuchaseOrder()
{
purchaseOrderListExample = new List<PurchaseOrder>();

2
TBF/Rig/Network/Camera/KeyenceIV3G120/GrabImagesOp.cs
View File

@ -47,7 +47,7 @@ namespace TBF.Rig.Network.Camera.KeyenceIV3G120
File.Delete(imgFileNames[0]);
/* if (camera.CameraCfg.DebugLevel == DebugMode.Simulate ||
camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
camera.CameraCfg.DebugLevel == DebugMode.DetectedOff)
{
///
/// Camera is in simulation mode => create a simulated image