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-10 19:33:54 +02:00
parent e3c8bc9923 b7f8be5048
commit 1e99a2aeee
5 changed files with 66 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppData/ComLib.cs
+60 -23
View File
@@ -333,6 +333,7 @@ namespace AppData
public int Qty { get; set; }
}
#if false
public class BatchData
{
/// <summary>
@@ -348,7 +349,7 @@ namespace AppData
/// 1 = stima
/// 2 = nesting
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
//[JsonConverter(typeof(StringEnumConverter))]
public int procType { get; set; }
/// <summary>
/// Codice della amcchina x cui si effettua richeista
@@ -358,9 +359,10 @@ namespace AppData
/// <summary>
/// Tipo di ordine richeisto
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
//[JsonConverter(typeof(StringEnumConverter))]
public oType orderType { get; set; }
}
}
#endif
/// <summary>
/// Salva su redis l'oggetto dei materiali serializzato
/// </summary>
@@ -670,34 +672,70 @@ namespace AppData
try
{
int mTime = 5;
// FIX pType a ESTIM
int pType = 1;
// serializzo ordini come ARRAY VUOTO
string redVal = "[]";
// salvo
string redKey = $"{redOutPath}:{nextEnv}:ORDERS";
// scrivo su REDIS
memLayer.ML.setRSV(redKey, redVal);
// ora ITEMS
var tblItm = DataLayer.man.taIL.getByOfflineOrder(OffOrderID);
// serializzo
redVal = JsonConvert.SerializeObject(tblItm);
// salvo
redKey = $"{redOutPath}:{nextEnv}:ITEMS";
// scrivo su REDIS
memLayer.ML.setRSV(redKey, redVal);
// init oggetti x fare cicli...
Order currOrder = null;
Kit currentKit = null;
Part currPart = null;
List<Order> listOrder = new List<Order>();
List<Kit> listKit = new List<Kit>();
List<Part> listPart = new List<Part>();
// elenco ITEMS
foreach (var rigaItem in tblItm)
{
currPart = new Part()
{
PartId = rigaItem.ItemID,
PartExtCode = rigaItem.ItemExtCode,
PartDtmx = rigaItem.ItemDtmx,
PartQty = rigaItem.ItemQty,
MatId = rigaItem.MatID,
CadFilePath = rigaItem.CadFilePath
};
listPart.Add(currPart);
}
// compongo KIT
currentKit = new Kit()
{
KitId = OffOrderID,
KitExtCode = $"OOK{OffOrderID:000000000}",
PartList = listPart
};
listKit.Add(currentKit);
// compongo ordine
currOrder = new Order()
{
OrderId = OffOrderID,
OrderCod = $"OFOR{OffOrderID:000000000}",
OrderExtCode = $"OFOR{OffOrderID:000000000}",
DestPlant = "00",
KitList = listKit
};
listOrder.Add(currOrder);
// ora versione gerarchica
var currBatch = new BatchData()
batchRequest newBatchreq = new batchRequest()
{
BatchId = OffOrderID,
maxTime = mTime,
procType = pType,
machineType = mType.Offline,
orderType = oType.OfflineOrder
EnvNum = nextEnv,
MaxTime = mTime,
ProcType = pType,
MachineType = mType.Offline,
OrderType = oType.OfflineOrder,
OrderList = listOrder
};
// serializzo
redVal = JsonConvert.SerializeObject(currBatch);
string redVal = JsonConvert.SerializeObject(newBatchreq);
// salvo
redKey = $"{redOutPath}:{nextEnv}:DATA";
string redKey = $"{redOutPath}:{nextEnv}";
// scrivo su REDIS
memLayer.ML.setRSV(redKey, redVal);
@@ -2281,6 +2319,5 @@ namespace AppData
#endregion
}
}
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=315']) {
withEnv(['NEXT_BUILD_NUMBER=316']) {
// 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_SDK/Objects.cs
+1 -4
View File
@@ -159,9 +159,6 @@ namespace NKC_SDK
/// </summary>
public List<string> SecOp { get; set; } = new List<string>();
}
/// <summary>
/// Classe Sheet x Nesting
/// </summary>
@@ -315,7 +312,7 @@ namespace NKC_SDK
/// <summary>
/// Tipo di ordine richiesto
/// </summary>
[JsonConverter(typeof(StringEnumConverter))]
//[JsonConverter(typeof(StringEnumConverter))]
public oType OrderType { get; set; } = oType.BatchRequest;
/// <summary>
/// Status del processo di nesting
NKC_WF/Controllers/BatchProcController.cs
+2
View File
@@ -277,6 +277,8 @@ namespace NKC_WF.Controllers
{
// deserializzo come OfflineOrder
nestReplyOffOrd rispNest = JsonConvert.DeserializeObject<nestReplyOffOrd>(content);
// segno offline order come processato...
// SALVO!!!
answ = "OK";
}
NKC_WF/Web.config
+2 -2
View File
@@ -36,9 +36,9 @@
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
</httpModules>
<!--Nascondo gli erroracci-->
<!--<customErrors mode="On" defaultRedirect="~/site/Default"/>-->
<customErrors mode="On" defaultRedirect="~/site/Default"/>
<!--Mostro gli erroracci-->
<customErrors mode="Off"/>
<!--<customErrors mode="Off"/>-->
</system.web>
<appSettings>
<!--Configurazioni generali-->