marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prductionsdate now from RadioTest

Browse Source
This commit is contained in:
Roland Drabesch
2023-02-27 10:53:10 +01:00
parent 204377fb30
commit 050fd97aaa
15 changed files with 498 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/ProductionUiCordonel/FinalTest.xaml.cs
+17 -23
View File
@@ -1,4 +1,9 @@
using System;
using Newtonsoft.Json;
using ProductionUiCordonel.ProductionProcesses;
using ProductionUiCordonel.ProductionProcesses.Actions;
using ProductionUiCordonel.ProductionProcesses.Enum;
using ProductionUiCordonel.UserControls.FinalTest;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
@@ -13,11 +18,6 @@ using System.Windows;
using System.Windows.Controls;
using System.Windows.Input;
using System.Windows.Threading;
using Newtonsoft.Json;
using ProductionUiCordonel.ProductionProcesses;
using ProductionUiCordonel.ProductionProcesses.Actions;
using ProductionUiCordonel.ProductionProcesses.Enum;
using ProductionUiCordonel.UserControls.FinalTest;
using Xylem.Common.CommonCore.Configuration;
using Xylem.Common.CommonCore.Consts;
using Xylem.Common.Hardware.WaterMeter.Genesis.GenesisConfig;
@@ -409,7 +409,10 @@ namespace ProductionUiCordonel
var connectProcess = new ProductionProcessConnect(CurrentGenesisMeter);
pc.Processes.Add(connectProcess); //[x] [x] [x]
if (RadioAddress != 0)
{
RadioAddress = 1;
}
orderBarcode = new ProductionProcessCheckOrderNumber(0);
@@ -427,17 +430,13 @@ namespace ProductionUiCordonel
pc.Processes.Add(new ProductionCheckShippingState()); //[x] [x] [x]
pc.Processes.Add(new ProductionProcessRegisterWatch());
pc.Processes.Add(new ProductionProcessPasswordFile()); //[x] [x] [x]
pc.Processes.Add(new ProductionProcessRegisterWatch());
//pc.Processes.Add(new ProductionProcessFinalParametrizationFix()); //[x] [x] []
pc.Processes.Add(new ProductionProcessFinalParametrizationVakoCsd(connectProcess, RadioAddress != 0)); //[x] [x] []
pc.Processes.Add(new ProductionProcessFinalParametrizationVakoCsd(connectProcess, true)); //[x] [x] []
pc.Processes.Add(new ProductionProcessRegisterWatch());
//if (RadioAddress != 0)
//{
var radioCheck = new ProductionProcessRadioCheck();
@@ -446,26 +445,21 @@ namespace ProductionUiCordonel
radioCheck.Ordernumber = ((ProductionProcessCheckOrderNumber)sender).Ordernumber;
};
pc.Processes.Add(radioCheck); //[] [] []
//}
pc.Processes.Add(new ProductionProcessRegisterWatch());
//pc.Processes.Add(new ProductionProcessSpecialConfig()); //[x] [x] []
pc.Processes.Add(new ProductionProcessShippingMode(true, RadioAddress != 0)); //[] [] []
pc.Processes.Add(new ProductionProcessShippingMode(true,true)); //[] [] []
pc.Processes.Add(new ProductionProcessRegisterWatch());
pc.Processes.Add(new ProductionProcessFinalParametrizationVakoCsd(connectProcess, RadioAddress != 0)); //[x] [x] []
pc.Processes.Add(new ProductionProcessFinalParametrizationVakoCsd(connectProcess, true)); //[x] [x] []
pc.Processes.Add(new ProductionProcessRegisterWatch());
pc.Processes.Add(new ProductionProcessShippingMode(false, RadioAddress != 0)); //[] [] []
pc.Processes.Add(new ProductionProcessShippingMode(false, true)); //[] [] []
pc.Processes.Add(new ProductionProcessRegisterWatch());
pc.Processes.Add(new ProductionProcessFullReadOut()); //[x] [x] [x]
pc.Processes.Add(new ProductionProcessLogOff()); //[] [] []
var checkAttach = new ProductionProcessCheckAttachment(OrderNumber);
orderBarcode.isDone += (x, g) =>
{
checkAttach.OrderNumber = ((ProductionProcessCheckOrderNumber)x).Ordernumber;
checkAttach.OrderNumber = ((ProductionProcessCheckOrderNumber)x).Ordernumber;
};
pc.Processes.Add(checkAttach); //[] [] []
@@ -528,7 +522,7 @@ namespace ProductionUiCordonel
{
return;
}
if (newMeter == null)
if (newMeter == null)
{
//remove all
CurrentProcess = "Warte auf Zähler";