roman/MIP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Oprava poctov v zozname dopytov

Browse Source
This commit is contained in:
roman6791
2021-10-25 18:01:23 +02:00
parent b71c08b07e
commit f175dd8dab
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Mip/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.10.0")]
[assembly: AssemblyFileVersion("1.1.10.0")]
[assembly: AssemblyVersion("1.1.11.0")]
[assembly: AssemblyFileVersion("1.1.11.0")]

2
Mip/frmMain.Designer.cs generated
View File

@@ -11935,7 +11935,7 @@
this.lblVerzia.Name = "lblVerzia";
this.lblVerzia.Size = new System.Drawing.Size(34, 13);
this.lblVerzia.TabIndex = 13;
this.lblVerzia.Text = "1,010";
this.lblVerzia.Text = "1,011";
this.lblVerzia.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// label50

2
Mip/frmMain.cs
View File

@@ -1240,7 +1240,7 @@ namespace Mip
IF (UpravaMaterialu = '',Material,CONCAT(Material,'-',UpravaMaterialu)) AS Material,
UpravaMaterialu,
Material,
IF (PocetDoVyroby=0,PocetKusov,CONCAT (PocetKusov,',',PocetDoVyroby,',', PocetKusov-(SELECT IFNULL( SUM(`tabexpedicia`.PocetOdoslanychKusov), 0) FROM `tabexpedicia` WHERE `tabexpedicia`.IDDopyt=`pohladdopyty`.IDCPOBJ ))) AS PocetKusov,
IF (PocetDoVyroby=0,PocetKusov,CONCAT (PocetKusov,', ',PocetDoVyroby,', ', (SELECT IFNULL( SUM(`tabexpedicia`.PocetVyrDobrychKusov), 0) FROM `tabexpedicia` WHERE `tabexpedicia`.IDDopyt=`pohladdopyty`.IDCPOBJ ))) AS PocetKusov,
RozlisZnakKonecnaOp,
SpojeneRozmery,
IF (StatusDopytu='Pozastavená',StatusDopytu,PoznamkaOBJ) AS PoznamkaOBJ