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

merge

Browse Source
This commit is contained in:
Roland Drabesch 2025-12-02 10:24:55 +01:00
parent 8ed9c1ec30
commit ff5a1a8cd9
6 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Common/.vs/Common/config/applicationhost.config
View File

@ -171,7 +171,7 @@
</site>
<site name="MeterProcessState(2)" id="4">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\SZLATEV\source\repos\laa_production\Common\Service\MeterProcessState" />
<virtualDirectory path="/" physicalPath="E:\REPO\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:50075:localhost" />

6
Common/CordonelPreadjustmentUi/CordonelPreadjustmentUi.csproj
View File

@ -5,7 +5,7 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{D0C8D887-ED52-40AB-A069-90BCE0E801E2}</ProjectGuid>
<OutputType>Library</OutputType>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Xylem.Common.Ui.CordonelPreadjustmentUi</RootNamespace>
<AssemblyName>Xylem.Common.Ui.CordonelPreadjustmentUi</AssemblyName>
@ -129,9 +129,7 @@
<PropertyGroup />
<PropertyGroup />
<PropertyGroup />
<PropertyGroup>
<NoWin32Manifest>true</NoWin32Manifest>
</PropertyGroup>
<PropertyGroup />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'VPN_Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\VPN_Debug\</OutputPath>

2
Common/LaaPackages

@ -1 +1 @@
Subproject commit 41c1163d102dbb63572e60c6ffd501e1765d848c
Subproject commit 664d2bc436f5d16e0d70030c0762730215a03581

2
Common/Production/ProductionUiCordonel/ProductionProcesses/RFTelegrams/RFTask.cs
View File

@ -78,7 +78,7 @@
}
else
{
this.SetError();
// this.SetError();
}
}
}

7
Common/Service/MeterProcessState/Controllers/OrderController.cs
View File

@ -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; }));

28
Common/Ui/GenesisToolBox/FrmMasterMapping.Designer.cs generated
View File

@ -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;
}
}