Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c3be3bfb53 | ||
|
|
a0b9909ae8 |
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
|
|||||||
// Build Number
|
// Build Number
|
||||||
// Revision
|
// Revision
|
||||||
//
|
//
|
||||||
[assembly: AssemblyVersion("3.9.2143.2")]
|
[assembly: AssemblyVersion("3.9.2143.300")]
|
||||||
[assembly: AssemblyFileVersion("3.9.2143.2")]
|
[assembly: AssemblyFileVersion("3.9.2143.300")]
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
|
|||||||
public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
|
public partial class CycleBeginningForm : Form, GenericDevices.IHasCompleted
|
||||||
{
|
{
|
||||||
private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm));
|
private static readonly ILog log = LogManager.GetLogger(typeof(CycleBeginningForm));
|
||||||
|
private static readonly ILog log_selected = LogManager.GetLogger("PurchaseOrderHistory");
|
||||||
|
|
||||||
/// <summary> Number of water meters </summary>
|
/// <summary> Number of water meters </summary>
|
||||||
public readonly int WaterMetersCount;
|
public readonly int WaterMetersCount;
|
||||||
@@ -264,6 +265,11 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
|
|||||||
Disabled[i] = !checkBoxes[i].Checked;
|
Disabled[i] = !checkBoxes[i].Checked;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//TODO create logger to log selected items and their order and Order number
|
||||||
|
string snTextArrString = SNText != null ? string.Join(", ", SNText) : string.Empty;
|
||||||
|
log_selected.DebugFormat("Purchase DLG - Selected Order: {0}, Last selected Box: {1}, All items: {2}",
|
||||||
|
orderComboBox.Text, purchaseBoxComboBox.Text,snTextArrString);
|
||||||
|
|
||||||
completed = true;
|
completed = true;
|
||||||
Close();
|
Close();
|
||||||
}
|
}
|
||||||
@@ -718,6 +724,17 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
|
|||||||
.SelectMany(pBox => pBox.PurchaseWaterMeterDataList)
|
.SelectMany(pBox => pBox.PurchaseWaterMeterDataList)
|
||||||
.Select(pWM => pWM.SerialNo);
|
.Select(pWM => pWM.SerialNo);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
string[] iEnumerable = serialNumbers as string[] ?? serialNumbers.ToArray();
|
||||||
|
log_selected.Debug(
|
||||||
|
$"Selected order: {choosenOrder} box: {choosenBox} possible serial numbers (form DB): {string.Join(", ", iEnumerable)}");
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
log_selected.Error("Error loading serial numbers: " + e);
|
||||||
|
}
|
||||||
|
|
||||||
//enable behaviour type
|
//enable behaviour type
|
||||||
bool addOnEndOnly = false;
|
bool addOnEndOnly = false;
|
||||||
|
|
||||||
@@ -726,6 +743,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
|
|||||||
|
|
||||||
if (countOfFreeBoxes < serialNumbers.Count())
|
if (countOfFreeBoxes < serialNumbers.Count())
|
||||||
{
|
{
|
||||||
|
log_selected.Debug(">" + serialNumbers.Count() + " Serial Numbers in box as we have free positions!");
|
||||||
MessageBox.Show(this, "We have more Serial Numbers in box as we have free positions!", "Warning",
|
MessageBox.Show(this, "We have more Serial Numbers in box as we have free positions!", "Warning",
|
||||||
MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
return;
|
return;
|
||||||
@@ -753,6 +771,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
|
|||||||
if (lastComboBoxSerialNo >= 0 || lastComboBoxSerialNo < enabledComboBoxes.Count)
|
if (lastComboBoxSerialNo >= 0 || lastComboBoxSerialNo < enabledComboBoxes.Count)
|
||||||
{
|
{
|
||||||
comboBoxes[lastComboBoxSerialNo].Text = serialNumber;
|
comboBoxes[lastComboBoxSerialNo].Text = serialNumber;
|
||||||
|
log_selected.Debug($"Added serial no: {serialNumber} to pos: {lastComboBoxSerialNo}");
|
||||||
lastComboBoxSerialNo++;
|
lastComboBoxSerialNo++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -762,6 +781,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
|
|||||||
if (iNextFreeNumber >= 0 || iNextFreeNumber < enabledComboBoxes.Count)
|
if (iNextFreeNumber >= 0 || iNextFreeNumber < enabledComboBoxes.Count)
|
||||||
{
|
{
|
||||||
comboBoxes[iNextFreeNumber].Text = serialNumber;
|
comboBoxes[iNextFreeNumber].Text = serialNumber;
|
||||||
|
log_selected.Debug($"Added serial no: {serialNumber} to pos: {iNextFreeNumber}");
|
||||||
lastComboBoxSerialNo = iNextFreeNumber;
|
lastComboBoxSerialNo = iNextFreeNumber;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -774,6 +794,7 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
|
|||||||
|
|
||||||
if (!noImplementedSerialNumbers.IsEmpty())
|
if (!noImplementedSerialNumbers.IsEmpty())
|
||||||
{
|
{
|
||||||
|
log_selected.Debug("No implemented serial numbers: " + noImplementedSerialNumbers);
|
||||||
MessageBox.Show(this,
|
MessageBox.Show(this,
|
||||||
string.Format("The following serial numbers were not implemented: {0}", noImplementedSerialNumbers),
|
string.Format("The following serial numbers were not implemented: {0}", noImplementedSerialNumbers),
|
||||||
"Serial Numbers repeating!", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
"Serial Numbers repeating!", MessageBoxButtons.OK, MessageBoxIcon.Warning);
|
||||||
|
|||||||
Reference in New Issue
Block a user