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

Merge branch 'develop'

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-01-29 19:27:19 +01:00
parent 770a4e9d94 49343d9288
commit e1b2d0b7e0
4 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NKC_WF/Controllers/BatchProcController.cs
-10
View File
@@ -277,18 +277,8 @@ namespace NKC_WF.Controllers
// deserializzo come OfflineOrder
nestReplyOffOrd rispNest = JsonConvert.DeserializeObject<nestReplyOffOrd>(content);
// SALVO!!!
answ = "OK";
}
#if false
foreach (var item in currBunk.SheetList)
{
DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd);
}
#endif
}
else
{
NKC_WF/Controllers/BunkController.cs
+11 -1
View File
@@ -72,7 +72,7 @@ namespace NKC_WF.Controllers
/// <summary>
/// Effettua la chaimata di update
/// Effettua la chiamata di update
/// </summary>
/// <param name="id"></param>
/// <param name="value"></param>
@@ -90,6 +90,11 @@ namespace NKC_WF.Controllers
foreach (var item in currBunk.SheetList)
{
DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd);
// SE machining completato --> status a LAVORATO!
if (item.Machining.DtEnd != null)
{
DataLayer.man.taIL.updateSheetStatus(item.SheetId, 1, "PROD");
}
}
}
// INVALIDO eventuale valore BUNK in REDIS...
@@ -125,6 +130,11 @@ namespace NKC_WF.Controllers
foreach (var item in currBunk.SheetList)
{
DataLayer.man.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd);
// SE machining completato --> status a LAVORATO!
if (item.Machining.DtEnd != null)
{
DataLayer.man.taIL.updateSheetStatus(item.SheetId, 1, "PROD");
}
}
}
answ = "OK";
NKC_WF/WebUserControls/cmp_batchList.ascx.cs
+1 -1
View File
@@ -148,7 +148,7 @@ namespace NKC_WF.WebUserControls
bool answ = false;
int status = -1;
int.TryParse(_status.ToString(), out status);
if (status > 3)
if (status > 3 && status < 8)
{
answ = true;
}
NKC_WF/WebUserControls/cmp_unloadSmart.ascx.cs
+17 -8
View File
@@ -23,6 +23,16 @@ namespace NKC_WF.WebUserControls
return hfDeviceId.Value;
}
}
/// <summary>
/// Postazione attuale (per ora cablata)
/// </summary>
protected string PlaceId
{
get
{
return "WRK001";
}
}
/// <summary>
/// Sheet selezionato...
@@ -265,7 +275,7 @@ namespace NKC_WF.WebUserControls
else
{
// dichiaro che è depositato
DataLayer.man.taIL.updateStatus(itemIdSelected, 4, "WRK001");
DataLayer.man.taIL.updateStatus(itemIdSelected, 4, PlaceId);
lblDestination.Text = $"Item {itemIdSelected} PUT IN CART {rawData}";
// elimino item sel...
ComLib.resetItemPickup(SheetID, DeviceId);
@@ -285,7 +295,7 @@ namespace NKC_WF.WebUserControls
else
{
// dichiaro che è depositato
DataLayer.man.taIL.updateStatus(itemIdSelected, 5, "WRK001");
DataLayer.man.taIL.updateStatus(itemIdSelected, 5, PlaceId);
lblDestination.Text = $"Item {itemIdSelected} PUT IN BIN {rawData}";
// elimino item sel...
ComLib.resetItemPickup(SheetID, DeviceId);
@@ -348,7 +358,7 @@ namespace NKC_WF.WebUserControls
case 2:
case 3:
// salvo che è in STATO 2 (picked up) --> HARD CODED su macchna WRK001
DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, "WRK001");
DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId);
// verifico cosa devo mostrare come PROX passaggio...
showCart = itemRow.ProcessesReq == "0";
showBin = itemRow.ProcessesReq == "2";
@@ -411,7 +421,6 @@ namespace NKC_WF.WebUserControls
}
}
private void resetIcons()
{
lblDestination.CssClass = "text-secondary";
@@ -496,7 +505,7 @@ namespace NKC_WF.WebUserControls
protected void lbtCancel_Click(object sender, EventArgs e)
{
// resetto item selezionato...
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, "WRK001");
DataLayer.man.taIL.updateStatus(itemIdSelected, 1, PlaceId);
itemIdSelected = 0;
showItemDetail(false, null, false);
}
@@ -506,7 +515,7 @@ namespace NKC_WF.WebUserControls
if (tabSheet.Count == 1)
{
// resetto sheet selezionato...
DataLayer.man.taIL.updateSheetStatusPU(tabSheet[0].SheetID, "WRK001");
DataLayer.man.taIL.updateSheetStatusPU(tabSheet[0].SheetID, PlaceId);
itemIdSelected = 0;
showItemDetail(false, null, false);
}
@@ -519,7 +528,7 @@ namespace NKC_WF.WebUserControls
protected void lbtParkArea_Click(object sender, EventArgs e)
{
// resetto item selezionato...
DataLayer.man.taIL.updateStatus(itemIdSelected, 3, "WRK001");
DataLayer.man.taIL.updateStatus(itemIdSelected, 3, PlaceId);
itemIdSelected = 0;
showItemDetail(false, null, false);
lblMessage.Text = "Item Parked";
@@ -532,7 +541,7 @@ namespace NKC_WF.WebUserControls
protected void lbtScrapped_Click(object sender, EventArgs e)
{
// resetto item selezionato...
DataLayer.man.taIL.updateStatus(itemIdSelected, 990, "WRK001");
DataLayer.man.taIL.updateStatus(itemIdSelected, 990, PlaceId);
//itemIdSelected = 0;
//showItemDetail(true, null, false);
lblMessage.Text = "Item Set SCRAPPED";