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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-12 20:20:42 +02:00
parent 78c4ba0395 7b601e09c9
commit fe50ea58d5
10 changed files with 57 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/ComLib.cs
+14 -7
View File
@@ -1928,6 +1928,7 @@ namespace AppData
List<string> itemsBin = new List<string>();
List<string> itemsSecOp = new List<string>();
List<string> itemsScrap = new List<string>();
List<string> itemsSelect = new List<string>();
//se ho items...
if (tabItems.Count > 0)
@@ -1960,6 +1961,11 @@ namespace AppData
{
itemsSecOp.Add(item.ItemDtmx);
}
// se selezionato status 2...
if (item.StatusID == 2)
{
itemsSelect.Add(item.ItemDtmx);
}
}
}
@@ -1980,7 +1986,8 @@ namespace AppData
answ = updateCssByItemList(answ, redKeyBase, "ItemsScrap", itemsScrap, dataCacheTTL);
// FIXED SEL da array oggetti selezionati...
answ = updateCssByPickedItems(answ, redKeyBase, "ItemsSel", dataCacheTTL);
answ = updateCssByItemList(answ, redKeyBase, "ItemsSel", itemsSelect, dataCacheTTL);
//answ = updateCssByPickedItems(answ, redKeyBase, "ItemsSel", dataCacheTTL);
// INFINE serializzo e salvo tutti gli items trovati...
@@ -2010,12 +2017,12 @@ namespace AppData
bool answ = false;
string rawData = memLayer.ML.getRSV($"{redKeyBase}:ItemsSel");
Dictionary<string, string> dictData = new Dictionary<string, string>();
if (!string.IsNullOrEmpty(rawData))
{
dictData = JsonConvert.DeserializeObject<Dictionary<string, string>>(rawData);
}
try
{
if (!string.IsNullOrEmpty(rawData))
{
dictData = JsonConvert.DeserializeObject<Dictionary<string, string>>(rawData);
}
// cerco chiave device...
if (dictData.ContainsKey(deviceId))
{
@@ -2064,12 +2071,12 @@ namespace AppData
rawData = JsonConvert.SerializeObject(dictData);
memLayer.ML.setRSV($"{redKeyBase}:ItemsSel", rawData);
answ = true;
// reset memoria redis del CSS x obbligare refresh...
memLayer.ML.setRSV($"{redKeyBase}:Css", "");
}
catch
{ }
}
// reset memoria redis del CSS x obbligare refresh...
memLayer.ML.setRSV($"{redKeyBase}:Css", "");
return answ;
}
DB/SqlSchemaCompare_All.scmp
+24
View File
@@ -926,10 +926,34 @@
<SelectedItem Type="Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlUser, Microsoft.Data.Tools.Schema.Sql, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>conn_NKC</Name>
</SelectedItem>
<SelectedItem Type="Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlProcedure, Microsoft.Data.Tools.Schema.Sql, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>prt</Name>
<Name>stp_prt_ItemLabel_OLD</Name>
</SelectedItem>
<SelectedItem Type="Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlProcedure, Microsoft.Data.Tools.Schema.Sql, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>prt</Name>
<Name>stp_prt_StackLabel_OLD</Name>
</SelectedItem>
<SelectedItem Type="Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlProcedure, Microsoft.Data.Tools.Schema.Sql, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>prt</Name>
<Name>stp_prt_StackLabelBunk_OLD</Name>
</SelectedItem>
</ExcludedSourceElements>
<ExcludedTargetElements>
<SelectedItem Type="Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlUser, Microsoft.Data.Tools.Schema.Sql, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>conn_NKC</Name>
</SelectedItem>
<SelectedItem Type="Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlProcedure, Microsoft.Data.Tools.Schema.Sql, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>prt</Name>
<Name>stp_prt_ItemLabel_OLD</Name>
</SelectedItem>
<SelectedItem Type="Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlProcedure, Microsoft.Data.Tools.Schema.Sql, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>prt</Name>
<Name>stp_prt_StackLabel_OLD</Name>
</SelectedItem>
<SelectedItem Type="Microsoft.Data.Tools.Schema.Sql.SchemaModel.SqlProcedure, Microsoft.Data.Tools.Schema.Sql, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Name>prt</Name>
<Name>stp_prt_StackLabelBunk_OLD</Name>
</SelectedItem>
</ExcludedTargetElements>
</SchemaComparison>
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=324']) {
withEnv(['NEXT_BUILD_NUMBER=325']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Controllers/getMUCssController.cs
+5 -3
View File
@@ -40,14 +40,16 @@ namespace NKC_WF.Controllers
string answ = "";
if (sheetID > 0)
{
// TTL standard
int dataCacheTTL = memLayer.ML.cdvi("cssCacheTTL");
dataCacheTTL = dataCacheTTL <= 0 ? 60 : dataCacheTTL;
// recupero da REDIS!
string redKey = $"{ComLib.machineUnloadArea(sheetID)}:Css";
// se vuoto scrivo VUOTO...
if (!memLayer.ML.redKeyPresent(redKey))
if (memLayer.ML.redKeyPresent(redKey))
{
memLayer.ML.setRSV(redKey, answ);
answ = memLayer.ML.getRSV(redKey);
}
answ = memLayer.ML.getRSV(redKey);
// RICALCOLO SOLO SE non trovo in REDIS (perché invalidato)
if (string.IsNullOrEmpty(answ))
// se vuoto lo calcolo...
NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx
+6 -4
View File
@@ -23,21 +23,23 @@
}).then(function (data) {
// se è cambiato...
if (data != lastVal) {
console.log("Changed cssRev: data=" + data + " | lastVal=" + lastVal);
$('#uplTavola').load(location.href + ' #dynCss');
document.getElementById('<%=hfCurrRev.ClientID%>').value = data;
}
});
}
});
// qui leggo la versione del BUNK (con cambio foglio...)
$.ajax({
url: "../api/getMUSheetRev/" + BunkId
}).then(function (data) {
// se è cambiato...
if (data != lastValBunk) {
console.log("Changed SheetReview: data=" + data + " | lastValBunk=" + lastValBunk);
// ricarico intera pagina!
location.reload();
document.getElementById('<%=hfCurrBunkRev.ClientID%>').value = data;
}
});
}
});
}
</script>
<svg width="2000" height="1000" xmlns='http://www.w3.org/2000/svg' runat="server" id="svgTable" class="img-fluid">
NKC_WF/WebUserControls/cmp_MU_svgViewer.ascx.cs
-2
View File
@@ -18,7 +18,6 @@ namespace NKC_WF.WebUserControls
if (hfBatchId.Value != value.ToString())
{
hfBatchId.Value = value.ToString();
//doUpdate();
}
}
get
@@ -38,7 +37,6 @@ namespace NKC_WF.WebUserControls
if (hfSheetId.Value != value.ToString())
{
hfSheetId.Value = value.ToString();
doUpdate();
}
}
get
NKC_WF/WebUserControls/cmp_unloadSmart.ascx
+2 -2
View File
@@ -60,7 +60,7 @@
</div>
</div>
<div class="col-12 px-0">
<asp:LinkButton runat="server" ID="lbtCancel" CssClass="btn btn-block btn-warning text-uppercase" OnClick="lbtCancel_Click"><i class="fa fa-ban" aria-hidden="true"></i> <%: traduci("cancel") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtCancel" CssClass="btn btn-block btn-warning text-uppercase" OnClick="lbtCancel_Click"><i class="fa fa-ban" aria-hidden="true"></i> <%: traduci("ResetItemPickup") %></asp:LinkButton>
</div>
<div class="col-12 px-0">
<b>
@@ -73,7 +73,7 @@
<asp:LinkButton runat="server" ID="lbtParkArea" CssClass="btn btn-block btn-secondary" OnClick="lbtParkArea_Click"><i class="fa fa-thumb-tack" aria-hidden="true"></i> <%: traduci("toPark") %></asp:LinkButton>
</div>
<div class="col-12 px-0">
<asp:LinkButton runat="server" ID="lbtResetSel" CssClass="btn btn-block btn-warning text-uppercase" OnClick="lbtResetSel_Click"><i class="fa fa-ban" aria-hidden="true"></i> <%: traduci("ResetSel") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtResetSel" CssClass="btn btn-block btn-warning text-uppercase" OnClick="lbtResetSel_Click"><i class="fa fa-ban" aria-hidden="true"></i> <%: traduci("ResetSheetPickup") %></asp:LinkButton>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+2 -1
View File
@@ -474,7 +474,8 @@ namespace NKC_WF.WebUserControls
case 2:
case 100:
// salvo che è in STATO 2 (picked up)
DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId);
DataLayer currDataLayer = new DataLayer();
currDataLayer.taIL.updateStatus(itemRow.ItemID, 2, PlaceId);
// verifico cosa devo mostrare come PROX passaggio...
showCart = string.IsNullOrEmpty(itemRow.ProcessesReq);
showBin = (itemRow.ProcessesReq.Contains("PaintFlag"));
NKC_WF/site/MachineUnload.aspx
+1 -7
View File
@@ -2,7 +2,6 @@
<%@ Register Src="~/WebUserControls/cmp_MU_svgViewer.ascx" TagPrefix="uc1" TagName="cmp_MU_svgViewer" %>
<%@ Register Src="~/WebUserControls/cmp_MU_stats.ascx" TagPrefix="uc1" TagName="cmp_MU_stats" %>
<%@ Register Src="~/WebUserControls/cmp_MU_suggestions.ascx" TagPrefix="uc1" TagName="cmp_MU_suggestions" %>
<%@ Register Src="~/WebUserControls/cmp_MU_bins.ascx" TagPrefix="uc1" TagName="cmp_MU_bins" %>
<%@ Register Src="~/WebUserControls/cmp_MU_carts.ascx" TagPrefix="uc1" TagName="cmp_MU_carts" %>
@@ -14,7 +13,7 @@
<div class="card-body py-1 bg-dark">
<asp:UpdatePanel runat="server" ID="upnlStats" UpdateMode="Always">
<ContentTemplate>
<asp:Timer ID="timerSvg" runat="server" Interval="1500" OnTick="timerSvg_Tick"></asp:Timer>
<asp:Timer ID="timerSvg" runat="server" Interval="1000" OnTick="timerSvg_Tick"></asp:Timer>
<asp:HiddenField ID="hfBatchID" runat="server" />
<asp:HiddenField ID="hfSheetID" runat="server" />
<uc1:cmp_MU_stats runat="server" ID="cmp_MU_stats" />
@@ -43,11 +42,6 @@
</asp:UpdatePanel>
</div>
</div>
<%--<asp:UpdatePanel runat="server" ID="upnlSuggest" UpdateMode="Conditional">
<ContentTemplate>
<uc1:cmp_MU_suggestions runat="server" ID="cmp_MU_suggestions" Visible="false" />
</ContentTemplate>
</asp:UpdatePanel>--%>
</div>
</div>
</div>
NKC_WF/site/MachineUnload.aspx.cs
+2 -12
View File
@@ -11,8 +11,6 @@ namespace NKC_WF
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
// svuoto redis...
memLayer.ML.redFlushKey(ComLib.redMachUnloadCount);
doUpdate();
}
}
@@ -64,6 +62,7 @@ namespace NKC_WF
cmp_MU_carts.BatchId = BatchId;
cmp_MU_svgViewer.BatchId = BatchId;
cmp_MU_svgViewer.SheetId = SheetId;
cmp_MU_svgViewer.doUpdate();
}
}
/// <summary>
@@ -111,22 +110,14 @@ namespace NKC_WF
int counter = numWaitSvg;
doUpdate();
// ogni x cicli
if (counter % 4 == 0)
if (counter % 10 == 0)
{
cmp_MU_stats.doUpdate();
upnlStats.DataBind();
// verifico se c'è richiesta reload UNLOAD...
if (!string.IsNullOrEmpty(memLayer.ML.getRSV(redProdForceReload)))
{
Response.Redirect(Request.RawUrl);
}
}
if (counter % 2 == 0)
{
cmp_MU_carts.doUpdate();
upnlCarts.DataBind();
cmp_MU_bins.doUpdate();
upnlCarts.DataBind();
}
incrNumWait();
}
@@ -166,7 +157,6 @@ namespace NKC_WF
if (numWaitSvg > 30)
{
memLayer.ML.resetRCnt(redProdReq);
Response.Redirect(Request.RawUrl);
}
memLayer.ML.setRCntI(redProdReq);
}