Purchase Order - Collector complete, bug fix in entities version 3.9.2149.11
This commit is contained in:
@@ -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")]
|
||||
|
||||
@@ -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>();
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user