From ff5a1a8cd9305dc0be8f241f8b5445d67b874005 Mon Sep 17 00:00:00 2001 From: Roland Drabesch Date: Tue, 2 Dec 2025 10:24:55 +0100 Subject: [PATCH] merge --- .../.vs/Common/config/applicationhost.config | 2 +- .../CordonelPreadjustmentUi.csproj | 6 ++-- Common/LaaPackages | 2 +- .../ProductionProcesses/RFTelegrams/RFTask.cs | 2 +- .../Controllers/OrderController.cs | 7 +++++ .../FrmMasterMapping.Designer.cs | 28 +++++++++++++++++-- 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/Common/.vs/Common/config/applicationhost.config b/Common/.vs/Common/config/applicationhost.config index 143ad9e1..5616ab8b 100644 --- a/Common/.vs/Common/config/applicationhost.config +++ b/Common/.vs/Common/config/applicationhost.config @@ -171,7 +171,7 @@ - + diff --git a/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj b/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj index 5b338084..39e39463 100644 --- a/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj +++ b/Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj @@ -5,7 +5,7 @@ Debug AnyCPU {D0C8D887-ED52-40AB-A069-90BCE0E801E2} - Library + WinExe Properties Xylem.Common.Ui.CordonelPreadjustmentUi Xylem.Common.Ui.CordonelPreadjustmentUi @@ -129,9 +129,7 @@ - - true - + true bin\VPN_Debug\ diff --git a/Common/LaaPackages b/Common/LaaPackages index 41c1163d..664d2bc4 160000 --- a/Common/LaaPackages +++ b/Common/LaaPackages @@ -1 +1 @@ -Subproject commit 41c1163d102dbb63572e60c6ffd501e1765d848c +Subproject commit 664d2bc436f5d16e0d70030c0762730215a03581 diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/RFTelegrams/RFTask.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/RFTelegrams/RFTask.cs index 5efb53ae..78bd4d99 100644 --- a/Common/Production/ProductionUiCordonel/ProductionProcesses/RFTelegrams/RFTask.cs +++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/RFTelegrams/RFTask.cs @@ -78,7 +78,7 @@ } else { - this.SetError(); + // this.SetError(); } } } diff --git a/Common/Service/MeterProcessState/Controllers/OrderController.cs b/Common/Service/MeterProcessState/Controllers/OrderController.cs index 6501452d..16f660fc 100644 --- a/Common/Service/MeterProcessState/Controllers/OrderController.cs +++ b/Common/Service/MeterProcessState/Controllers/OrderController.cs @@ -100,7 +100,14 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers StringBuilder sb = new StringBuilder(); sb.AppendLine($" delete Auftrag.dbo.Cordonel_AssignedPicking where CordonelAssignedPicking_PcbId = {PcbId} ; "); sb.AppendLine($" delete Auftrag.dbo.Cordonel_PressureTest where CordonelPressureTest_PcbId = {PcbId} ; "); + sb.AppendLine($" update AuftragPositionSerienNr set StatusFertigung = 25 where SerienNr in (select MapPcbIdToSerialNumber_SerialNumber from Auftrag.[dbo].[MapPcbIdToSerialNumber] where MapPcbIdToSerialNumber_PcbId = {PcbId}); "); + sb.AppendLine($" update [Auftrag].[dbo].[CordonelMeterCalibrationResults] set PcbID = PcbID * -1 where PcbID = {PcbId} "); + sb.AppendLine($" delete Auftrag.[dbo].[MapPcbIdToSerialNumber] where MapPcbIdToSerialNumber_PcbId = {PcbId} ; "); + sb.AppendLine($" update Genesis_PcbPassword set PcbId = cast(PcbId as int) *-1 where pw.PcbId = '{PcbId}' ; "); + + + sb.AppendLine($" select 1 "); var dt = dataAccess.ExecuteQuery(sb.ToString()); return Request.CreateResponse(HttpStatusCode.OK, await Task.Run(() => { return dt; })); diff --git a/Common/Ui/GenesisToolBox/FrmMasterMapping.Designer.cs b/Common/Ui/GenesisToolBox/FrmMasterMapping.Designer.cs index c04adf86..1de32116 100644 --- a/Common/Ui/GenesisToolBox/FrmMasterMapping.Designer.cs +++ b/Common/Ui/GenesisToolBox/FrmMasterMapping.Designer.cs @@ -63,6 +63,8 @@ this.label10 = new System.Windows.Forms.Label(); this.txtHyMapOrder = new System.Windows.Forms.TextBox(); this.txtHyMapPcb = new System.Windows.Forms.TextBox(); + this.label11 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.piBoQr)).BeginInit(); @@ -216,6 +218,8 @@ // // tabPage3 // + this.tabPage3.Controls.Add(this.label11); + this.tabPage3.Controls.Add(this.label12); this.tabPage3.Controls.Add(this.btnRemoveSure); this.tabPage3.Controls.Add(this.btnRemove); this.tabPage3.Controls.Add(this.label8); @@ -238,7 +242,7 @@ // // btnRemoveSure // - this.btnRemoveSure.Location = new System.Drawing.Point(203, 230); + this.btnRemoveSure.Location = new System.Drawing.Point(203, 272); this.btnRemoveSure.Name = "btnRemoveSure"; this.btnRemoveSure.Size = new System.Drawing.Size(163, 47); this.btnRemoveSure.TabIndex = 43; @@ -249,7 +253,7 @@ // // btnRemove // - this.btnRemove.Location = new System.Drawing.Point(34, 230); + this.btnRemove.Location = new System.Drawing.Point(34, 272); this.btnRemove.Name = "btnRemove"; this.btnRemove.Size = new System.Drawing.Size(163, 47); this.btnRemove.TabIndex = 42; @@ -426,6 +430,24 @@ this.txtHyMapPcb.Size = new System.Drawing.Size(128, 20); this.txtHyMapPcb.TabIndex = 8; // + // label11 + // + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(188, 191); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(10, 13); + this.label11.TabIndex = 45; + this.label11.Text = "-"; + // + // label12 + // + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(32, 191); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(44, 13); + this.label12.TabIndex = 44; + this.label12.Text = "PW File"; + // // FrmMasterMapping // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -485,5 +507,7 @@ private System.Windows.Forms.Label label10; private System.Windows.Forms.TextBox txtHyMapOrder; private System.Windows.Forms.TextBox txtHyMapPcb; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.Label label12; } } \ No newline at end of file