Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Maybe fix rilettura multipla

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-07-25 16:31:24 +02:00
parent e08bde68e3
commit f10dacc8a8
4 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=293']) {
withEnv(['NEXT_BUILD_NUMBER=294']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.10.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/WebUserControls/cmp_barcode.ascx.cs
-1
View File
@@ -85,7 +85,6 @@ namespace NKC_WF.WebUserControls
/// <returns></returns>
public void resetInput()
{
//inputAcquired = "";
valueRead = "";
txtBarcode.Focus();
}
NKC_WF/WebUserControls/cmp_stackBuilding.ascx
+1 -1
View File
@@ -61,7 +61,7 @@
<asp:ControlParameter ControlID="hfStackId" DefaultValue="0" Name="StackID" PropertyName="Value" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:Timer runat="server" Interval="1000" OnTick="Unnamed1_Tick"></asp:Timer>
<asp:Timer runat="server" Interval="2000" OnTick="Unnamed1_Tick"></asp:Timer>
</ContentTemplate>
</asp:UpdatePanel>
</div>
NKC_WF/WebUserControls/cmp_stackBuilding.ascx.cs
+1
View File
@@ -86,6 +86,7 @@ namespace NKC_WF.WebUserControls
// chiamo stored x indicare preparato
DataLayer.man.taSHL.setPrepared(nextTbl[0].SheetID);
cmp_barcode.resetInput();
lastCmd = "";
}
else
{