252 Commits

Author SHA1 Message Date
Samuele Locatelli a0c2732a7d Merge branch 'develop' into SDK/Gomba 2023-09-14 16:14:20 +02:00
Samuele Locatelli 1ceb6bd9a3 Test CI/CD x Gomba nuget 2023-09-14 16:14:13 +02:00
Samuele Locatelli 15bfe327a7 Update con pacchetti nuget unstable 2023-09-14 16:02:47 +02:00
Samuele Locatelli a3a8d39e8b Merge branch 'SDK/Gomba' into develop 2023-09-14 15:53:32 +02:00
Samuele Locatelli c50f5825d3 Inizio modifica yaml x Gomba 2023-09-14 15:53:17 +02:00
Samuele Locatelli d684c46be4 Eliminazione old lib Gomba.Core 2023-09-14 15:53:03 +02:00
Samuele E. Locatelli b599aa0352 Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/Mapo-IOB-WIN into develop 2023-09-14 15:35:39 +02:00
Samuele E. Locatelli ecd04bae25 fix dataora test lettura 2023-09-14 15:35:33 +02:00
Samuele Locatelli dfe2202446 Merge tag 'AddCleanupDir01' into develop
Fix cleanup cartella temp di caricamento
2023-09-14 15:02:49 +02:00
Samuele Locatelli 31fe51a3f4 Merge branch 'release/AddCleanupDir01' 2023-09-14 15:02:38 +02:00
Samuele Locatelli 411b598cea Merge branch 'develop' of https://gitlab.steamware.net/steamware/Mapo-IOB-WIN into develop 2023-09-14 15:02:11 +02:00
Samuele Locatelli dbe14e68a0 Update con reset nome files in temp dir 2023-09-14 15:02:08 +02:00
Samuele E. Locatelli 6e054645f1 update proc di test Gomba 2023-09-13 11:35:38 +02:00
Samuele E. Locatelli 194871b523 Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/Mapo-IOB-WIN into develop 2023-09-12 16:34:38 +02:00
Samuele E. Locatelli 34909a5c07 ancora update test Gomba 2023-09-12 16:34:32 +02:00
Samuele Locatelli e73498d254 Merge tag 'FixFanuc435_01' into develop
Test fix fanuc x 435
2023-09-12 15:07:16 +02:00
Samuele Locatelli e6bc49301e Merge branch 'release/FixFanuc435_01' 2023-09-12 15:07:10 +02:00
Samuele Locatelli 5ea0b34c90 Merge branch 'develop' of https://gitlab.steamware.net/steamware/Mapo-IOB-WIN into develop 2023-09-12 15:06:43 +02:00
Samuele Locatelli ed7a05ada7 Modifiche FANUC x gestione veto invio 2023-09-12 15:06:41 +02:00
Samuele E. Locatelli 353f952fc4 Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/Mapo-IOB-WIN into develop 2023-09-12 12:06:08 +02:00
Samuele E. Locatelli 64df450c98 update test gomba 2023-09-12 12:06:02 +02:00
Samuele Locatelli 034e85c79d Merge tag 'FixMtcRestart08' into develop
Fix variabile accessoria queue
2023-09-12 12:02:45 +02:00
Samuele Locatelli 248f3db782 Merge branch 'release/FixMtcRestart08' 2023-09-12 12:02:30 +02:00
Samuele Locatelli 02a0a86d1a update x valore campo queue corretto 2023-09-12 12:02:16 +02:00
Samuele Locatelli f9908cc63d Merge tag 'FixMtcRestart07' into develop
modifica gestione queueIn --> log al cambio valore
2023-09-12 11:23:47 +02:00
Samuele Locatelli 38f2a0c3b1 Merge branch 'release/FixMtcRestart07' 2023-09-12 11:23:33 +02:00
Samuele Locatelli f9a0488abb Merge branch 'develop' of https://gitlab.steamware.net/steamware/Mapo-IOB-WIN into develop 2023-09-12 11:23:18 +02:00
Samuele Locatelli 794f2ce843 Update gestione queueIn x MTC 2023-09-12 11:23:02 +02:00
Samuele E. Locatelli 38b9ed255d Update test GOMBA 2023-09-12 11:13:42 +02:00
Samuele E. Locatelli 8db90cdc84 Bozza iniziale comunicazione GOMBA 2023-09-12 10:08:24 +02:00
Samuele Locatelli 797a447fd1 bozza proxy gomba 2023-09-12 09:37:51 +02:00
Samuele E. Locatelli 4171111d73 Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/Mapo-IOB-WIN into develop 2023-09-12 09:02:08 +02:00
Samuele E. Locatelli 4785347879 sln x SOAP 2023-09-12 09:01:52 +02:00
Samuele E. Locatelli cd40165ce5 Aggiunta bozza CLI SOAP x Gomba 2023-09-12 09:01:09 +02:00
Samuele Locatelli 2e4dba8c4a Merge tag 'FixMtcRestart06' into develop
Update x trappola gestione veto invio al boot x MTC
2023-09-11 18:14:36 +02:00
Samuele Locatelli f4b182674b Merge branch 'release/FixMtcRestart06' 2023-09-11 18:14:09 +02:00
Samuele Locatelli c6929b6ff2 IOB-MTC:
- Aggiunti ulteriori blocchi esecuzione lettura dati in fase avvio
2023-09-11 18:13:34 +02:00
Samuele Locatelli 9efc9cba7d Merge tag 'FixMtcRestart05' into develop
Fix in tutti gli IOB x boolean gestione invio in coda
2023-09-08 18:46:20 +02:00
Samuele Locatelli 5bf8cec3be Merge branch 'release/FixMtcRestart05' 2023-09-08 18:46:02 +02:00
Samuele Locatelli 9d36511fa5 Fix modalità abilitazione coda con bool in tutti gli IOB 2023-09-08 18:45:45 +02:00
Samuele Locatelli 805afb982f Merge tag 'FixMtcRestart04' into develop
rimesso update lastReadPLC x MTC
2023-09-08 17:34:47 +02:00
Samuele Locatelli 6bc92da2c1 Merge branch 'release/FixMtcRestart04' 2023-09-08 17:34:40 +02:00
Samuele Locatelli 002ee09ccd update last read PLC x MTC 2023-09-08 17:34:25 +02:00
Samuele Locatelli d1e1e5f61f Merge tag 'FixMtcRestart03' into develop
Veto QueueIN x MTC su readSemafori
2023-09-08 16:25:42 +02:00
Samuele Locatelli 54c66f4a34 Merge branch 'release/FixMtcRestart03' 2023-09-08 16:25:33 +02:00
Samuele Locatelli 5aa35b741d cambio logica veto x MTConnect x lettura semafori 2023-09-08 16:25:18 +02:00
Samuele Locatelli 1aaec8ed5e Merge tag 'FixMtcRestart02' into develop
Gestione veto accodamento info all'avvio della coda IN configurabile (x
MTC in reload)
2023-09-08 15:23:22 +02:00
Samuele Locatelli 8697a0f6ec Merge branch 'release/FixMtcRestart02' 2023-09-08 15:22:57 +02:00
Samuele Locatelli 83e971f1e9 Aggiunto veto accodamento QUEUE-IN:
- default 1 sec
- configurabile in OPCPAR come VETO_QUEUE_IN=15
- indica num secondi x cui NON accoda info IN per l'invio
2023-09-08 15:22:38 +02:00
Samuele Locatelli d0dd2707b3 Merge tag 'FixMtcRestart01' into develop
Fix preliminari x MTC
2023-09-08 11:49:02 +02:00
Samuele Locatelli 5ab9ef8b51 Merge branch 'develop' 2023-09-08 11:47:46 +02:00
Samuele Locatelli e89e743ec2 Update MTConnect x problema disconnesisone in avvio 2023-09-08 11:47:12 +02:00
Samuele Locatelli 053ccdf4f1 Merge tag 'NewSingleAssemblyCosturaFody01' into develop
Completata review errori compilazione
update nuget vari
aggiunta costura fody x single assembly
2023-09-07 11:02:55 +02:00
Samuele Locatelli a9e5363390 Merge branch 'release/NewSingleAssemblyCosturaFody01' 2023-09-07 11:02:38 +02:00
Samuele Locatelli cb4d158cf2 Fix rimozione XML da release 2023-09-07 11:01:09 +02:00
Samuele Locatelli cb6c8564f1 Cleanup Soluzione con Fody.Weavers 2023-09-07 10:56:46 +02:00
Samuele Locatelli 31c48f50e5 Update slowCheetach + rimozione prettyBin x test (OK compila) 2023-09-07 09:51:26 +02:00
Samuele Locatelli 293dc103f8 Autogenerate binding redirect x icoel proxy 2023-09-07 09:25:04 +02:00
Samuele Locatelli debc16e42e Ancora upgrade IOB-MAN 2023-09-07 09:06:02 +02:00
Samuele Locatelli cd7cdb7326 Update IOB-MAN 2023-09-07 08:59:56 +02:00
Samuele Locatelli e87e2ab036 Update nuget x selenium driver x WPS 2023-09-07 08:40:12 +02:00
Samuele Locatelli f95f6d5386 Update sintassi pub channel redis 2023-09-07 08:39:59 +02:00
Samuele Locatelli 68b819e430 Update conf x package icoel (rimozione massiva!!!) 2023-09-07 08:16:09 +02:00
Samuele Locatelli e8812faad2 Update riferimenti x autobinding redirect 2023-09-07 08:10:02 +02:00
Samuele Locatelli 4825b10e35 code cleanup 2023-09-06 19:24:14 +02:00
Samuele Locatelli 7e825d0e93 Ancora update nuget 2023-09-06 19:21:55 +02:00
Samuele Locatelli 924519f157 Ancora update nuget x ProxyIcoel 2023-09-06 19:01:59 +02:00
Samuele Locatelli 24ff59aeb8 Update nuget EgwProxyIcoel 2023-09-06 18:51:25 +02:00
Samuele Locatelli eb4655edbd Inizio fix warning compilazione 2023-09-06 18:43:50 +02:00
Samuele Locatelli 9be445273e Merge tag 'FixPingReadPlc04' into develop
Update gestione ping aggiornata
2023-09-06 18:08:10 +02:00
Samuele Locatelli 87f7288c08 Merge branch 'release/FixPingReadPlc04' 2023-09-06 18:08:01 +02:00
Samuele Locatelli 4f21fc3b94 Ancora update PING x ritorno online 2023-09-06 18:07:45 +02:00
Samuele Locatelli 3e9a96861f Merge tag 'FixPingReadPlc03' into develop
Tentativo fix ping IOB
2023-09-06 15:35:39 +02:00
Samuele Locatelli 4d0353cd83 Merge branch 'release/FixPingReadPlc03' 2023-09-06 15:35:30 +02:00
Samuele Locatelli 13c10dc0dc Ancor amodifica ocmportamento PING 2023-09-06 15:35:12 +02:00
Samuele Locatelli 5f5b89e445 Merge tag 'FixPingReadPlc02' into develop
Timeout last ping rivisto
2023-09-06 11:50:50 +02:00
Samuele Locatelli eddec0566a Merge branch 'release/FixPingReadPlc02' 2023-09-06 11:50:43 +02:00
Samuele Locatelli f78c1422be Ancora update ping x timeout primo ping 2023-09-06 11:50:24 +02:00
Samuele Locatelli 25fa766aeb Merge tag 'FixPingReadPlc01' into develop
Fix gestione lastConnectPLC x ping adapter
2023-09-06 10:52:48 +02:00
Samuele Locatelli 9f6d5a80da Merge branch 'release/FixPingReadPlc01' 2023-09-06 10:50:51 +02:00
Samuele Locatelli bb14c275d5 Update ping x aggiornamento variabile lastreadPLC 2023-09-06 10:50:27 +02:00
Samuele Locatelli 9a70d3806f Merge tag 'FixPingDisconnectOnLoad01' into develop
Fix ping adapter x disconnessioni all'avvio
2023-09-05 14:48:01 +02:00
Samuele Locatelli 22fbc5c763 Merge branch 'release/FixPingDisconnectOnLoad01' 2023-09-05 14:47:46 +02:00
Samuele Locatelli 7e819f39ad Update PING adapter
- check errate disconnessioni immediate
- check con/senza ODL
2023-09-05 14:47:20 +02:00
Samuele Locatelli 845567ca33 Merge tag 'UpdateSeleniumNuget01' into develop
update selenium drivers
2023-07-31 17:17:31 +02:00
Samuele Locatelli d0c14f17fd Merge branch 'release/UpdateSeleniumNuget01' 2023-07-31 17:17:22 +02:00
Samuele Locatelli 6ae0a594e6 update nuget selenium IDE x MAPO 2023-07-31 17:14:23 +02:00
Samuele Locatelli 458d378c12 Update conf x export fixed-width AS400 2023-07-26 19:06:50 +02:00
Samuele Locatelli d5f041756b Update conf consumi x Tenditalia (errore nome colonne) 2023-07-24 16:14:04 +02:00
Samuele Locatelli ed93c4d123 Merge tag 'AddOutputFixWidth_AS400' into develop
completato merge versione FIMAT x Tenditalia con output AS400 in fixed
width
2023-07-19 15:22:34 +02:00
Samuele Locatelli a2423c157d Merge branch 'release/AddOutputFixWidth_AS400' 2023-07-19 15:22:15 +02:00
Samuele Locatelli 86a7bdc912 Update conf x FIMAT Tenditalia effettivo 2023-07-19 15:21:46 +02:00
Samuele Locatelli 604ab558fc Completata review gestione output FixedWidth x Tenditalia 2023-07-10 14:26:32 +02:00
Samuele Locatelli af461e1cbf Aggiunta PRELIMINARE funzionalità save fixedWidth 2023-07-10 13:36:33 +02:00
Samuele Locatelli b9c6bbcd82 Merge tag 'FixEmptyQueueOnClose01' into develop
Gestione condizione chiusura e svuotamento code (evitato se c'è redis
 queue)
2023-07-06 12:37:14 +02:00
Samuele Locatelli 73958c8573 Merge branch 'release/FixEmptyQueueOnClose01' 2023-07-06 12:36:59 +02:00
Samuele Locatelli fe9543681a Fix condizione uscita e send valori 2023-07-06 12:36:26 +02:00
Samuele Locatelli 56b5850b1a Merge tag 'AddRedisQueueOnSim02' into develop
Aggiornamento gestione Count x DataQueue (diminuzione op lettura)
2023-07-05 14:53:02 +02:00
Samuele Locatelli c5e4605de6 Merge branch 'release/AddRedisQueueOnSim02' 2023-07-05 14:52:20 +02:00
Samuele Locatelli 96be4bdf64 Update gestione Count x DataQueue 2023-07-05 14:51:59 +02:00
Samuele Locatelli ff1586b36d Merge tag 'AddRedisQueueOnSim' into develop
Aggiunta gestione coda redis e test in SIM
2023-07-05 14:10:50 +02:00
Samuele Locatelli 7abe80f7b0 Merge branch 'release/AddRedisQueueOnSim' 2023-07-05 14:10:42 +02:00
Samuele Locatelli 27d76311a0 Update conf x redis queue in SIM 2023-07-05 14:10:30 +02:00
Samuele Locatelli 88d65ae806 Update x gestione code REDIS/Memoria 2023-07-05 14:09:24 +02:00
Samuele Locatelli 03e2d68477 Refresh Stel 2023-07-05 10:25:35 +02:00
Samuele Locatelli d9de2b52d6 Merge tag 'UpdateSqlDbLantekPama01' into develop
Update x ritorno PODL con codice + data/ora eventi
2023-06-06 20:03:35 +02:00
Samuele Locatelli 6b73efa871 Merge branch 'release/UpdateSqlDbLantekPama01' 2023-06-06 20:03:19 +02:00
Samuele Locatelli 597597ef5b SqlDB:
- Update gestione Lantek x DB (ritorno PODL)
- Update PAMA x invio cod PODL
2023-06-06 20:02:22 +02:00
Samuele Locatelli c884e4886a Merge tag 'UpdateIcoelDbConf' into develop
Update x gestione corretta parametri DB/Server ICOEL
2023-05-31 14:35:50 +02:00
Samuele Locatelli d1eeb7f43e Merge branch 'release/UpdateIcoelDbConf' 2023-05-31 14:35:37 +02:00
Samuele Locatelli b644a9973f Update icoel DB:
- gest server + nome DB parametrica corretta
2023-05-31 14:35:19 +02:00
Samuele Locatelli a57fc701aa Merge tag 'UpdateInterclaysMixOxFe01' into develop
Update x OMRON Interclais impianto Mix OxFe
2023-05-18 18:58:22 +02:00
Samuele Locatelli 092e2cea15 Merge branch 'release/UpdateInterclaysMixOxFe01' 2023-05-18 18:58:02 +02:00
Samuele Locatelli b3db69f682 Interclays - OMRON:
- Update x gestione nuovi bit stato poweron / lavora x mix OxFe
2023-05-18 18:57:24 +02:00
Samuele Locatelli de7d55ac7d Merge tag 'FixOpcUaRebootToEmerg02' into develop
fix merge con remote x conf test
2023-05-16 09:41:19 +02:00
Samuele Locatelli cd49fe747c Merge branch 'release/FixOpcUaRebootToEmerg02' 2023-05-16 09:40:59 +02:00
Samuele Locatelli c987caf75e Merge branch 'develop' of https://gitlab.steamware.net/steamware/Mapo-IOB-WIN into develop 2023-05-16 09:40:31 +02:00
Samuele Locatelli de908b710c Merge tag 'FixOpcUarebootToEmerg' into develop
Fix reboot OPC-UA di Cimolai (andava in emergenza) --> fix ping ad ip
diverso da CNC...
2023-05-16 09:40:04 +02:00
Samuele Locatelli 5d83283178 Merge branch 'release/FixOpcUarebootToEmerg' 2023-05-16 09:39:45 +02:00
Samuele E. Locatelli 23143ff639 update x test baglietto, andata! 2023-05-16 09:38:41 +02:00
Samuele Locatelli 34ee4d48ab OPC-UA Cimolai:
- update x evitare errore in riavvio notturno che porta emergenza
2023-05-16 09:16:44 +02:00
Samuele Locatelli 9fdee19c7c Update x gestione nuovo campo ip di ping 2023-05-16 09:16:11 +02:00
Samuele Locatelli 2f2a1c5856 Merge tag 'ReorgIobFolders01' into develop
Riorganizzazione interna codice con folder e gruppi IOB
2023-04-27 14:54:59 +02:00
Samuele Locatelli 236b44a7d5 Merge branch 'release/ReorgIobFolders01' 2023-04-27 14:54:35 +02:00
Samuele Locatelli aac9d92780 CodeMaid reorg 2023-04-27 14:53:43 +02:00
Samuele Locatelli 6a214b937d Spostamento IobGenerici + refresh namespace base 2023-04-27 14:52:16 +02:00
Samuele Locatelli 5a46383da4 Fix area IobNet 2023-04-27 14:45:57 +02:00
Samuele Locatelli 5828994ee3 Reorg codice CodeMaid x IobSiemens 2023-04-27 14:42:57 +02:00
Samuele Locatelli 305af5c74d Update area IobSiemens 2023-04-27 14:34:44 +02:00
Samuele Locatelli dcf95e37ce CodeMaid cleanup x IobOpcUa 2023-04-27 14:30:09 +02:00
Samuele Locatelli b44092654c Modifica preliminare blocco IobOpcUa 2023-04-27 14:26:05 +02:00
Samuele Locatelli 7d4b9e8fdf Typo correction Beckhoff 2023-04-27 14:19:45 +02:00
Samuele Locatelli 4b1d5d9ba5 Update IobBeckhoff 2023-04-27 14:18:26 +02:00
Samuele Locatelli d32968950a reord codemaid 2023-04-27 13:06:55 +02:00
Samuele Locatelli 87a480132b Reord area SQL e Icoel (special/gen) 2023-04-27 13:05:50 +02:00
Samuele Locatelli b6f5df7cc0 CodeMain in area modBusTCP 2023-04-27 13:02:19 +02:00
Samuele Locatelli ee9d6bccd9 Riorganizzata area IobModbusTCP 2023-04-27 12:57:35 +02:00
Samuele Locatelli 020d48ef81 Riorganizzato area IobFile 2023-04-27 12:52:20 +02:00
Samuele Locatelli b5a10f0a4d Fix display valori 0 raw x SIG-IN 2023-04-27 12:40:59 +02:00
Samuele Locatelli 4fbd022656 Merge tag 'AddSoitaabFileAdapter01' into develop
Aggiunta adapter Soitaab file-based
2023-04-27 12:26:03 +02:00
Samuele Locatelli f7741afc30 Merge branch 'release/AddSoitaabFileAdapter01' 2023-04-27 12:25:54 +02:00
Samuele Locatelli 5aa295e892 Merge branch 'develop' of https://gitlab.steamware.net/steamware/Mapo-IOB-WIN into develop 2023-04-27 12:02:16 +02:00
Samuele Locatelli 05464488c2 update appunti 2023-04-27 12:02:10 +02:00
Samuele E. Locatelli 9c74816bab Aggiunto test ping preliminare 2023-04-27 12:00:59 +02:00
Samuele E. Locatelli e0847cd908 Update con correzioni check cartella 2023-04-27 11:58:30 +02:00
Samuele Locatelli 916939ac04 Reorg code Lantek 2023-04-27 11:14:10 +02:00
Samuele Locatelli ff43684c34 Eliminati riferimenti metodi file-based x LANTEK 2023-04-27 11:13:56 +02:00
Samuele Locatelli 10f24fd8a9 Ancora update adapter 2023-04-27 11:10:38 +02:00
Samuele Locatelli 7fe9041597 Update adapter file soitaab (2 test!) 2023-04-27 11:10:30 +02:00
Samuele Locatelli d0abff101f inizio riscrittura adapter file Soitaab 2023-04-27 10:57:39 +02:00
Samuele Locatelli f0cd2524cf Riorganizzazione file conf x SOITAAB x splittare in 2 IOB 2023-04-27 10:56:16 +02:00
Samuele E. Locatelli c593e804a7 Aggiunta appunti 2023-04-24 12:11:36 +02:00
Samuele E. Locatelli c35950da01 Merge tag 'TesLantekSoitaab03' into develop
Update con testing invio stati da lettura logFile --> OK!
2023-04-24 12:04:39 +02:00
Samuele E. Locatelli 4f56bfefba Merge branch 'release/TesLantekSoitaab03' 2023-04-24 12:04:19 +02:00
Samuele E. Locatelli 10cda086d2 Update SOITAAB:
- ok decodifica sstati "oggi" da file
- possibile rilettura dati vecchi (ma a che pro?)
- da dividere in 2 una volta saputo cosa dice lantek
2023-04-24 12:03:40 +02:00
Samuele E. Locatelli b31ade6b6a fix test null x logfile 2023-04-24 11:33:26 +02:00
Samuele E. Locatelli 5730bfa154 update conf x test online soitaab 2023-04-24 11:32:48 +02:00
Samuele E. Locatelli c8f2572f51 Update x inizio sdoppiamento tra adapter SQL lantek e adapter file-based soitaab 2023-04-24 10:10:21 +02:00
Samuele E. Locatelli 71c8a26ac8 Update x fluxLog da SoiTaab 2023-04-24 09:37:36 +02:00
Samuele E. Locatelli 9a348bef64 completato review x lettura log e generare FluxLog + SigLog 2023-04-21 17:00:15 +02:00
Samuele E. Locatelli 62cf634c95 Ok confronto righe vecchie/nuove nel log... 2023-04-21 16:02:47 +02:00
Samuele E. Locatelli 789defb69d update x acquisizione logtable da SOITAAB 2023-04-21 15:14:37 +02:00
Samuele E. Locatelli a10d23b131 Merge tag 'TesLantekSoitaab02' into develop
Fix gestione file csproj sballato
2023-04-21 09:39:45 +02:00
Samuele E. Locatelli a75726bdad Merge branch 'release/TesLantekSoitaab02' 2023-04-21 09:39:29 +02:00
Samuele E. Locatelli 06d05b8d95 fix *.csproj 2023-04-21 09:38:33 +02:00
Samuele E. Locatelli c11a9a91b8 Merge tag 'TesLantekSoitaab01' into develop
Update con gestione lantek che fa sempre export all
2023-04-21 09:34:59 +02:00
Samuele E. Locatelli d2596d57df Merge branch 'release/TesLantekSoitaab01' 2023-04-21 09:34:36 +02:00
Samuele E. Locatelli 2a98a0270a Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/Mapo-IOB-WIN into develop 2023-04-21 09:32:30 +02:00
Samuele E. Locatelli 5ed50840ac aggiunta export prima di import x lantek 2023-04-21 09:27:45 +02:00
Samuele Locatelli 3a6689d752 Rename conf soitaab 2023-04-20 18:54:37 +02:00
Samuele E. Locatelli 3538277d0b Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/Mapo-IOB-WIN into develop 2023-04-18 19:31:28 +02:00
Samuele E. Locatelli 51e0486c01 Merge conf x SOITAAB 2023-04-18 19:31:22 +02:00
Samuele Locatelli 76052f9b23 Update conf file SOITAAB 2023-04-18 19:30:47 +02:00
Samuele Locatelli e71de2c52f Aggiunta conf test soitaab preliminare 2023-04-18 09:06:44 +02:00
Samuele Locatelli c19b635366 - tolto aree NON impiegate x invio parametri attivi
- fix gestione progetto (aree PIZ09/10 da NON copiare always)
2023-04-14 17:59:55 +02:00
Samuele Locatelli dff6e4a4e2 update x migliore log in invio parametri conf 2023-04-14 17:58:34 +02:00
Samuele Locatelli 6acc206fb1 Merge tag 'ModbusTCP_FixWriteHamPizzaferri' into develop
Update x fix scrittura HAM x pizzaferri
2023-04-14 12:44:05 +02:00
Samuele Locatelli 674e34f9b5 Merge branch 'release/ModbusTCP_FixWriteHamPizzaferri' 2023-04-14 12:43:56 +02:00
Samuele Locatelli 79f20fd611 FIX ModBus HAM x pizzaferri 2023-04-14 12:43:35 +02:00
Samuele Locatelli 0758afdd98 Merge tag 'ModbusTCP_FixexetaskSyncDB' into develop
Fix gestione execute task syncDbData x ModbusTCP
2023-04-14 09:58:04 +02:00
Samuele Locatelli 3160d2b60b Merge branch 'release/ModbusTCP_FixexetaskSyncDB' 2023-04-14 09:57:51 +02:00
Samuele Locatelli 6b5c4ddaa7 fix mancata esecuzione task scrittura/sync in ModbusTCP 2023-04-14 09:57:19 +02:00
Samuele Locatelli 957d245a53 Merge tag 'UpdatelogPrepareRecipe01' into develop
Aggiornamento log invio ricette x FIMAT
2023-04-14 09:51:51 +02:00
Samuele Locatelli eca5cd628c Merge branch 'release/UpdatelogPrepareRecipe01' 2023-04-14 09:51:36 +02:00
Samuele Locatelli 1118725454 update x log copia ricette tenditalia 2023-04-14 09:51:10 +02:00
Samuele Locatelli d28d3ddcfa Merge tag 'AddReportCsvFimat02' into develop
Update x recupero sync ricette
2023-04-13 11:18:45 +02:00
Samuele Locatelli f6b926d77e Merge branch 'release/AddReportCsvFimat02' 2023-04-13 11:18:33 +02:00
Samuele Locatelli 48ffbb6de1 Completato test import ricette in sync 2023-04-13 10:34:14 +02:00
Samuele Locatelli 7010548337 Gestione import ricette (DA PROVARE!!!) 2023-04-12 19:23:26 +02:00
Samuele Locatelli 55e8aada24 Ok processing settimane consumo passate... 2023-04-12 17:46:29 +02:00
Samuele Locatelli 7aed2bfb32 Merge tag 'AddReportCsvFimat01' into develop
Aggiunta preliminare gestione FIMAT x ricette e report output consumi
2023-04-12 17:01:48 +02:00
Samuele Locatelli 3c215cbaa5 Merge branch 'release/AddReportCsvFimat01' 2023-04-12 17:01:24 +02:00
Samuele Locatelli c16ca8d422 Tenditalia/FIMAT:
- Completato setup da conf x output consumi FIMAT
2023-04-12 16:53:23 +02:00
Samuele Locatelli 77ba05537c Ok chiamate x FIMAT
- archivio zip
- cancellazione tra compiti da svolgere
2023-04-12 11:02:06 +02:00
Samuele Locatelli 79e9e6c348 correzione calcolo DateTime con millisecondi x chaiamte PODL 2023-04-11 11:35:34 +02:00
Samuele Locatelli 97bc417be4 update gestione ricette 2023-04-08 11:12:38 +02:00
Samuele Locatelli 6b7a854bb1 Spostamento ricette fimat in area temp conf generica esterna 2023-04-08 11:12:32 +02:00
Samuele Locatelli 1d08af6a1f PODL x FIMAT:
- Bozza metodi x inviare dati avvio/chiusura PODL (DA TESTARE!!!)
2023-04-07 19:20:49 +02:00
Samuele Locatelli 1abbbf0f06 Refactor/Typo 2023-04-07 18:25:57 +02:00
Samuele Locatelli 52632c24ba riorganizzazione gestione file ricette in adapter generic 2023-04-07 18:23:48 +02:00
Samuele Locatelli ee8a02c156 bozza nuova app import XML (copia da Excel Import) 2023-04-06 19:41:14 +02:00
Samuele Locatelli 6b3e5b8715 Aggiunti folder profile x pubblicazione 2023-04-06 19:41:05 +02:00
Samuele Locatelli c2d76264eb Merge tag 'FixFimatExport02' into develop
Fix file export 02
2023-04-06 14:42:35 +02:00
Samuele Locatelli 6c1f620775 Merge branch 'release/FixFimatExport02' 2023-04-06 14:42:26 +02:00
Samuele Locatelli 81abde6743 update file copy task 2023-04-06 14:42:10 +02:00
Samuele Locatelli b4afc67f55 Merge tag 'FixFimatExport01' into develop
update export ricette
2023-04-06 12:59:33 +02:00
Samuele Locatelli bfd46d3c26 Merge branch 'release/FixFimatExport01' 2023-04-06 12:59:15 +02:00
Samuele Locatelli 32a0be9f90 update conf FIMAT 2023-04-06 12:58:43 +02:00
Samuele Locatelli fbd955e218 OK test creazione + copia + archiviazione 2023-04-06 11:39:31 +02:00
Samuele Locatelli 86b17ddeba OK test simula x creazione ricette XML (multiple) 2023-04-06 09:24:57 +02:00
Samuele Locatelli 206020281d commit parziale gestione ricette 2023-04-05 19:52:19 +02:00
Samuele Locatelli dbc4a03df2 cambio val elapsed time x reconnecting 2023-03-31 17:44:49 +02:00
Samuele Locatelli 9a9138998b Merge tag 'FixCimolaiOpcDisconnectedLost' into develop
Fix riavvio OpcUa quando non poweroff e non aggiornato
2023-03-27 12:14:16 +02:00
Samuele Locatelli 57992108cd Merge branch 'release/FixCimolaiOpcDisconnectedLost' 2023-03-27 12:13:59 +02:00
Samuele Locatelli 020516dcac Fix reboot OPC-UA su mancato udpate info 2023-03-27 12:13:22 +02:00
Samuele Locatelli 6d1ba5f1ad FIX conf MTConnect IMI 50 CMS:
- fix gestione emergenza non armata a true
- test in prod
2023-03-24 15:47:33 +01:00
Samuele Locatelli a347d4e60d Fix template ricette FIMAT 2023-03-23 18:03:23 +01:00
Samuele Locatelli f7420ad6c5 script fix contenuto file ricette 2023-03-23 18:00:51 +01:00
Samuele Locatelli 2c5f3ad29c rename file ricette:
- +10'000 (x --> 10'00x)
2023-03-23 17:59:50 +01:00
Samuele Locatelli 36b5e5c81e Inizio gestione ricette FIMAT da tempalte, conf... 2023-03-23 12:37:40 +01:00
Samuele Locatelli c20adac35c Aggiunta XML ricette FIMAT (NON in install) 2023-03-23 12:37:29 +01:00
Samuele Locatelli 1b46b1b083 Merge tag 'TestFimat03' into develop
Fix conf x FIMAT
2023-03-21 19:07:30 +01:00
Samuele Locatelli b6e0353f78 Merge branch 'release/TestFimat03' 2023-03-21 19:07:24 +01:00
Samuele Locatelli 0dd39fc73f FIMAT:
- fix stati (discr input --> holdReg)
- fix conf (-1 valori da tab iniziale)
2023-03-21 19:07:08 +01:00
Samuele Locatelli ca960ff094 Merge tag 'TestFimat02' into develop
Aggiunta layer traduzione valori stati modbus (FIMAT)
2023-03-21 16:30:04 +01:00
Samuele Locatelli 6776fe848f Merge branch 'release/TestFimat02' 2023-03-21 16:29:17 +01:00
Samuele Locatelli 0f0acaae49 Update Gestione FIMAT x bit trad 2023-03-21 16:28:58 +01:00
Samuele Locatelli b3315ebc7c Update x decodifica traduzione valori FIMAT... 2023-03-20 20:08:40 +01:00
Samuele Locatelli 4255a813d6 Merge tag 'TestFimat01' into develop
Update di test x FIMAT
2023-03-20 12:12:51 +01:00
Samuele Locatelli 4abc80f676 Merge branch 'release/TestFimat01' 2023-03-20 12:12:38 +01:00
Samuele Locatelli 1c17d2ed2d Update x metodi chiusura ODL x SQL PAMA 2023-03-20 12:10:44 +01:00
Samuele Locatelli 200ba3c7d5 Update con conf FIMAT di test 2023-03-20 12:10:30 +01:00
Samuele E. Locatelli 8c38ac95ec Merge remote-tracking branch 'gitlab/develop' into develop 2023-03-17 12:15:12 +01:00
Samuele Locatelli b4e5297c5a Merge tag 'UpdateSqlPama' into develop
Test gestione emtodi estesi PAMA
2023-03-17 12:13:39 +01:00
Samuele Locatelli f63a34a547 Merge branch 'release/UpdateSqlPama' 2023-03-17 12:13:19 +01:00
Samuele Locatelli 26e2f3a3a0 Merge remote-tracking branch 'origin/develop' into develop 2023-03-17 12:13:00 +01:00
Samuele E. Locatelli 0829d4474a Chiusura TASK x DB 2023-03-17 12:12:41 +01:00
Samuele E. Locatelli 42185bf93e Test scrittura PODL OK anche post modifiche + log 2023-03-17 12:06:56 +01:00
Samuele E. Locatelli c5e5a5befe Update stato stored PAMA 2023-03-17 10:46:18 +01:00
Samuele E. Locatelli 466e91de18 fix stored (updated) 2023-03-17 08:41:52 +01:00
Samuele E. Locatelli 083362ccf7 Spostamento area stored SQL di test 2023-03-17 08:39:07 +01:00
Samuele E. Locatelli 90fb77a2c3 Update stored PAMA 2023-03-16 14:20:19 +01:00
Samuele E. Locatelli 6e96070cd1 udpate conf RIMOR 2023-03-16 13:22:50 +01:00
Samuele E. Locatelli 60972602b0 Fix ricalcolo indici x SqlImport PAMA 2023-03-16 13:22:44 +01:00
Samuele E. Locatelli a4bdc7fd21 test vern RIMOR 2023-03-16 11:07:22 +01:00
Samuele Locatelli fa7d1fdee6 Merge tag 'IobRimorAddOdlClose' into develop
Aggiunta gestioen end ODL da bit su RIMOR ModBus
2023-03-16 10:01:13 +01:00
Samuele Locatelli e7dc77a058 Merge branch 'release/IobRimorAddOdlClose' 2023-03-16 10:00:54 +01:00
Samuele Locatelli e12de0f60e aggiunta gestione chiusura ODL x RIMOR 2023-03-16 10:00:26 +01:00
Samuele Locatelli 9e76475908 Merge tag 'IobSqlDbAddSendFluxLog' into develop
Aggiunta gestione preliminare invio fluxLog (da testare)
2023-03-16 08:58:10 +01:00
Samuele Locatelli cda3a89b78 Merge branch 'release/IobSqlDbAddSendFluxLog' 2023-03-16 08:57:54 +01:00
Samuele Locatelli add5495c29 Aggiunta gestione FluxLog da DB x invio IOB 2023-03-16 08:57:23 +01:00
Samuele Locatelli 8799c74874 PAMA:
- aggiunta gestione PODL --> sync DB
2023-03-15 16:00:09 +01:00
472 changed files with 33071 additions and 6632 deletions
+86 -8
View File
@@ -286,11 +286,28 @@ EgwProxy.SqlDb:build:
script:
- '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
EgwProxy.Gomba:build:
stage: build
tags:
- win
variables:
APP_NAME: EgwProxy.Gomba
only:
refs:
- develop
- SDK/Gomba
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m'
# --------------------------------
# STAGING: (nuget beta)
# --------------------------------
EgwProxy.Ftp:build:staging:
EgwProxy.Ftp:staging:
stage: staging
needs: ["EgwProxy.Ftp:build"]
tags:
@@ -313,7 +330,7 @@ EgwProxy.Ftp:build:staging:
- '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
EgwProxy.Icoel:build:staging:
EgwProxy.Icoel:staging:
stage: staging
needs: ["EgwProxy.Icoel:build"]
tags:
@@ -336,7 +353,7 @@ EgwProxy.Icoel:build:staging:
- '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
EgwProxy.MultiCncLib:build:staging:
EgwProxy.MultiCncLib:staging:
stage: staging
needs: ["EgwProxy.MultiCncLib:build"]
tags:
@@ -360,7 +377,7 @@ EgwProxy.MultiCncLib:build:staging:
- '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
EgwProxy.OsaiCncLib:build:staging:
EgwProxy.OsaiCncLib:staging:
stage: staging
needs: ["EgwProxy.OsaiCncLib:build"]
tags:
@@ -384,7 +401,7 @@ EgwProxy.OsaiCncLib:build:staging:
- '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
EgwProxy.SqlDb:build:staging:
EgwProxy.SqlDb:staging:
stage: staging
needs: ["EgwProxy.SqlDb:build"]
tags:
@@ -407,6 +424,30 @@ EgwProxy.SqlDb:build:staging:
- '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
EgwProxy.Gomba:staging:
stage: staging
needs: ["EgwProxy.Gomba:build"]
tags:
- win
variables:
CONFIG: Debug
APP_NAME: EgwProxy.Gomba
only:
refs:
- develop
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
- *version-fix
- *nuspec-fix
script:
- '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m'
- '& Remove-Item *.nupkg'
- '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"'
- '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
# --------------------------------
# RELEASE
# --------------------------------
@@ -598,6 +639,29 @@ EgwProxy.SqlDb:build:release:
- '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
EgwProxy.Gomba:build:release:
stage: release
needs: ["EgwProxy.Gomba:build"]
tags:
- win
variables:
CONFIG: Release
APP_NAME: EgwProxy.Gomba
only:
refs:
- SDK/Gomba
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:APP_NAME.sln" -verbosity quiet'
- *version-fix
- *nuspec-fix
script:
- '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=$env:CONFIG /p:Platform="Any CPU" /p:OutputPath=bin/$env:CONFIG /verbosity:minimal /m'
- '& Remove-Item *.nupkg'
- '& $env:NUGET_PATH pack "$env:APP_NAME.Release.nuspec"'
- '& "$env:NUGET_PATH" setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted'
- '& "$env:NUGET_PATH" push *$env:NUM_REL.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
# --------------------------------
# DocFx
# --------------------------------
@@ -659,13 +723,27 @@ EgwProxy.OsaiCncLib:docfx:
EgwProxy.SqlDb:docfx:
stage: docfx
needs: ["EgwProxy.Icoel:build"]
needs: ["EgwProxy.SqlDb:build"]
tags:
- win
variables:
APP_NAME: EgwProxy.Icoel
APP_NAME: EgwProxy.SqlDb
only:
- SDK/Icoel
- SDK/SqlDb
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
- *DocReplica
EgwProxy.Gomba:docfx:
stage: docfx
needs: ["EgwProxy.Gomba:build"]
tags:
- win
variables:
APP_NAME: EgwProxy.Gomba
only:
- SDK/Gomba
script:
- docfx $env:APP_NAME/docfx.json
- mv $env:APP_NAME/_site "docfx"
+11
View File
@@ -0,0 +1,11 @@
# ToDo's aperti
## ALL
- verifica disattivazione WDST da IOB vari
- riorganizzazione GLOBALE degli IOB x folder del tipo iob (OPC-UA, ModBus, Siemens...)
## IMI REMOSA
Da completare:
- lantek: capire come rendono il link tra dati PODL e part program
- check stato dati IMI altri impianto (sembrano "vuotini")
BIN
View File
Binary file not shown.
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net6.0\win-x64\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<_TargetId>Folder</_TargetId>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
<PublishReadyToRun>false</PublishReadyToRun>
</PropertyGroup>
</Project>
+37
View File
@@ -0,0 +1,37 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32516.85
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EgwCApp.Core", "EgwCApp.Core\EgwCApp.Core.csproj", "{DF02D478-2309-48B8-BF0D-90B02327AF02}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EgwCApp.XmlProc", "EgwCApp.XmlProc\EgwCApp.XmlProc.csproj", "{64BC5889-BE30-489A-B78F-8B3EE08819CB}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EgwCApp.XmlTesting", "EgwCApp.XmlTesting\EgwCApp.XmlTesting.csproj", "{52D72303-ACAB-4289-8856-0F56A50474FC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{DF02D478-2309-48B8-BF0D-90B02327AF02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{DF02D478-2309-48B8-BF0D-90B02327AF02}.Debug|Any CPU.Build.0 = Debug|Any CPU
{DF02D478-2309-48B8-BF0D-90B02327AF02}.Release|Any CPU.ActiveCfg = Release|Any CPU
{DF02D478-2309-48B8-BF0D-90B02327AF02}.Release|Any CPU.Build.0 = Release|Any CPU
{64BC5889-BE30-489A-B78F-8B3EE08819CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{64BC5889-BE30-489A-B78F-8B3EE08819CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{64BC5889-BE30-489A-B78F-8B3EE08819CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{64BC5889-BE30-489A-B78F-8B3EE08819CB}.Release|Any CPU.Build.0 = Release|Any CPU
{52D72303-ACAB-4289-8856-0F56A50474FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{52D72303-ACAB-4289-8856-0F56A50474FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{52D72303-ACAB-4289-8856-0F56A50474FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{52D72303-ACAB-4289-8856-0F56A50474FC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2AF3181F-288A-47D5-8087-2AB660476D85}
EndGlobalSection
EndGlobal
@@ -0,0 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\EgwCApp.Core\EgwCApp.Core.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="testConf.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
+378
View File
@@ -0,0 +1,378 @@
using EgwCApp.Core;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static EgwCApp.Core.WharehouseData;
namespace EgwCApp.XmlProc
{
public class ImportProc
{
#region Public Constructors
/// <summary>
/// Init oggetto per import
/// </summary>
/// <param name="confFileName"></param>
public ImportProc(string confFileName)
{
if (!string.IsNullOrEmpty(confFileName))
{
fileConfName = confFileName;
}
}
#endregion Public Constructors
#region Public Methods
/// <summary>
/// Decodifica configurazione
/// </summary>
/// <returns></returns>
public bool decodeConfig()
{
bool answ = false;
if (!string.IsNullOrEmpty(fileConfName))
{
// deserializzo config
if (!File.Exists(fileConfName))
{
Console.WriteLine($"Error: ConfigFile not found | {fileConfName}");
}
else
{
string rawData = File.ReadAllText(fileConfName);
// se ho contenuto procedo
if (string.IsNullOrEmpty(rawData))
{
Console.WriteLine($"Error: ConfigFile empty! | {fileConfName}");
}
else
{
// deserializzo
taskConfig = JsonConvert.DeserializeObject<ConfigFile>(rawData);
answ = taskConfig != null;
}
}
}
return answ;
}
/// <summary>
/// Esegue import (se possibile)
/// </summary>
/// <returns></returns>
public bool doProcess()
{
bool answ = false;
if (taskConfig != null)
{
// verifico esista il file...
if (string.IsNullOrEmpty(taskConfig.FileInPath) && File.Exists(taskConfig.FileInPath))
{
// manca file ingresso!!! esco!
}
else
{
// verifico il tipo di process necessario...
switch (taskConfig.Type)
{
case ImportType.CSV:
fileReturnData = File.ReadAllText(taskConfig.FileInPath);
answ = true;
break;
case ImportType.Excel:
fileReturnData = processExcelImport(taskConfig.FileInPath);
answ = true;
break;
case ImportType.ND:
default:
break;
}
}
}
return answ;
}
/// <summary>
/// Esecuzione ritorno informazioni secondo configurazione...
/// </summary>
/// <returns></returns>
public bool doReturn()
{
bool answ = false;
if (taskConfig != null)
{
// verifico il tipo di return necessario...
switch (taskConfig.Return)
{
case ReturnMode.Console:
Console.WriteLine(fileReturnData);
answ = true;
break;
case ReturnMode.Redis:
break;
case ReturnMode.File:
// verifico path ci sia... sennò creo
string outPath = string.IsNullOrEmpty(taskConfig.FileOutPath) ? "FileOut.txt" : taskConfig.FileOutPath;
// verifico se vadano salvati in una folder differente...
if (!string.IsNullOrEmpty(taskConfig.ConvertDir))
{
if (!Directory.Exists(taskConfig.ConvertDir))
{
Directory.CreateDirectory(taskConfig.ConvertDir);
}
outPath = Path.Combine(taskConfig.ConvertDir, Path.GetFileName(outPath));
}
// salvo il file!
File.WriteAllText(outPath, fileReturnData);
answ = true;
break;
case ReturnMode.ND:
default:
break;
}
// se fatto eventualmente archivio
if (answ)
{
if (!string.IsNullOrEmpty(taskConfig.ArchiveDir))
{
// verifico cartella archivio
if (!Directory.Exists(taskConfig.ArchiveDir))
{
Directory.CreateDirectory(taskConfig.ArchiveDir);
}
// sposto file
string fName = Path.GetFileName(taskConfig.FileInPath);
File.Move(taskConfig.FileInPath, Path.Combine(taskConfig.ArchiveDir, fName), true);
}
}
}
return answ;
}
#endregion Public Methods
#region Protected Properties
/// <summary>
/// Nome del file config da processare
/// </summary>
protected string fileConfName { get; set; } = "";
/// <summary>
/// Contenuto del file da restituire come return data (serializzato)
/// </summary>
protected string fileReturnData { get; set; } = "";
/// <summary>
/// Configurazione del task da eseguire
/// </summary>
protected ConfigFile? taskConfig { get; set; } = new ConfigFile();
#endregion Protected Properties
#region Protected Methods
/// <summary>
/// Estrae da una riga l'i-esimo elemento
/// </summary>
/// <param name="riga"></param>
/// <param name="col"></param>
/// <returns></returns>
protected string getCellVal(System.Data.DataRow? riga, int col)
{
string answ = "";
if (riga != null)
{
try
{
answ = $"{riga.ItemArray[col]}".Trim();
}
catch
{ }
}
return answ;
}
/// <summary>
/// Cleanup stringa x impiego tipo ident da char dubbi
/// </summary>
/// <param name="origData"></param>
/// <returns></returns>
protected string strFixId(string origData)
{
return origData.Replace(".", "").Replace(" ", "_");
}
#endregion Protected Methods
#region Private Methods
/// <summary>
/// Importa un file excel e restituisce una
/// </summary>
/// <param name="fileItem"></param>
/// <returns></returns>
private string processExcelImport(string fileItem)
{
string outVal = "";
int numErr = 0;
// test procedura di import files excel x Giacovelli...
var currExcel = new ExcelMan(fileItem);
// creo lista dati in formato RegGiacenze...
Dictionary<string, BatchRec> listaGiac = new Dictionary<string, BatchRec>();
var dtSet = currExcel.getDataSet();
if (dtSet != null && dtSet.Tables != null && dtSet.Tables.Count > 0)
{
string nomeFile = Path.GetFileName(fileItem);
nomeFile = nomeFile.Substring(0, nomeFile.LastIndexOf("."));
var elSheet = dtSet.Tables;
int idxTab = 0;
// cerco lo sheet corretto se > 1
if (dtSet.Tables.Count > 1)
{
bool found = false;
for (int i = 0; i < dtSet.Tables.Count; i++)
{
if (nomeFile.Contains(dtSet.Tables[i].TableName))
{
idxTab = i;
found = true;
break;
}
// controllo parametro opzionale...
if (!found && taskConfig != null && !string.IsNullOrEmpty(taskConfig.TargetName))
{
if (dtSet.Tables[i].TableName == taskConfig.TargetName)
{
idxTab = i;
break;
}
}
}
}
var tabella = dtSet.Tables[idxTab];
int numRighe = tabella.Rows.Count;
int idxODL = taskConfig != null ? taskConfig.IdxODL : 0;
for (int i = 0; i < numRighe; i++)
{
if (taskConfig != null && taskConfig.ProcessParamInt != null && taskConfig.ProcessParamInt.Count > 5)
{
if (numErr < numRighe / 5)
{
try
{
// variabili di appoggio...
DateTime dtRif = DateTime.Today;
double qtyTot = 0;
int numPack = 0;
var riga = tabella.Rows[i];
if (riga != null)
{
string ddt = getCellVal(riga, taskConfig.ProcessParamInt["ExtDoc"]);
string sDate = getCellVal(riga, taskConfig.ProcessParamInt["DateRif"]);
string prod = getCellVal(riga, taskConfig.ProcessParamInt["Product"]);
// verifiche x import: header, data e DDT (vuoti o "-") --> SKIP!
bool checkHeaderKo = (ddt == "DDT" || prod == "PRODOTTO");
bool checkEmptyDdt = (string.IsNullOrEmpty(ddt) || ddt == "-");
bool checkEmptyDate = (string.IsNullOrEmpty(sDate) || sDate == "-");
if (checkHeaderKo)
{
//lgTrace($"SKIP header");
}
else if (checkEmptyDdt || checkEmptyDate)
{
//lgTrace($"SKIP linea vuota | i: {i} | ddt: {ddt} | date: {sDate} | prod: {prod}");
}
else
{
string variety = getCellVal(riga, taskConfig.ProcessParamInt["Variety"]);
string suppl = getCellVal(riga, taskConfig.ProcessParamInt["Supplier"]);
string sQty = getCellVal(riga, taskConfig.ProcessParamInt["QtyTot"]);
string sNum = getCellVal(riga, taskConfig.ProcessParamInt["NumPack"]);
string numPed = getCellVal(riga, taskConfig.ProcessParamInt["NumPed"]);
string packPed = getCellVal(riga, taskConfig.ProcessParamInt["PackPed"]);
string pesoPack = getCellVal(riga, taskConfig.ProcessParamInt["PesoPack"]);
DateTime.TryParse(sDate, out dtRif);
int.TryParse(sNum, out numPack);
double.TryParse(sQty, out qtyTot);
string identRG = ddt.Length > 2 ? $"{strFixId(ddt)}.{strFixId(prod)}.{strFixId(variety)}.{strFixId(suppl)}" : $"{dtRif:yyyyMMdd}.{strFixId(prod)}.{strFixId(variety)}.{strFixId(suppl)}";
string notes = $"{numPed}x{packPed}x{pesoPack}";
// verifico di avere dati per proseguire...
bool checkIdent = !string.IsNullOrEmpty($"{prod}{variety}{suppl}");
if (checkIdent)
{
BatchRec newRow = new BatchRec()
{
IdxODL = idxODL,
IdentRG = identRG,
DateRif = dtRif,
ExtDoc = ddt,
Product = prod,
Variety = variety,
Supplier = suppl,
NumPack = numPack,
QtyTot = qtyTot,
Notes = notes
};
// verifico: se manca aggiungo
if (!listaGiac.ContainsKey(identRG))
{
listaGiac.Add(identRG, newRow);
}
else
{
// altrimenti aggiorno giacenza con valori numerici
listaGiac[identRG].NumPack += newRow.NumPack;
listaGiac[identRG].QtyTot += newRow.QtyTot;
}
}
else
{
//lgError($"Errore verifica identità riga | prod: {prod} | variety: {variety} | suppl: {suppl}");
numErr++;
}
}
}
}
catch (Exception exc)
{
numErr++;
}
}
}
}
}
if (listaGiac.Count > 0)
{
// converto in una nuova lista...
int rCounter = 1;
Dictionary<int, BatchRec> list2Send = new Dictionary<int, BatchRec>();
foreach (var item in listaGiac)
{
list2Send.Add(rCounter, item.Value);
rCounter++;
}
// serializzo e restituisco file JSON...
var serVal = JsonConvert.SerializeObject(list2Send);
if (serVal != null && !string.IsNullOrEmpty(serVal))
{
outVal = serVal;
}
}
return outVal;
}
#endregion Private Methods
}
}
+62
View File
@@ -0,0 +1,62 @@
// See https://aka.ms/new-console-template for more information
// ExcImport: Excel Importer, per IobWin in logica lettura Giacenze
// parametri:
// $0: Path ConfigFile file per esecuzione
using EgwCApp.XmlProc;
string separator = "--------------------------------------";
string fileName = "";
// controllo args, se mancassero o incompleti mostro help
if (args.Length < 1)
{
Console.WriteLine(separator);
Console.WriteLine("- ExcelFileImporter - Core 6.0");
Console.WriteLine("- v.0.0.0.0 | @Egalware 2022+");
Console.WriteLine(separator);
Console.WriteLine();
Console.WriteLine("Mancano parametri per esecuzione:");
Console.WriteLine("");
Console.WriteLine("$0: ConfigFile da impiegare");
// provo a processare testConf...
fileName = "testConf.json";
}
else
{
fileName = args[0];
}
// ora processo se ho filename valido...
if (!string.IsNullOrEmpty(fileName))
{
// verifico se ho file...
if (File.Exists(fileName))
{
ImportProc importObj = new ImportProc(fileName);
bool stepOk = importObj.decodeConfig();
if (stepOk)
{
stepOk = importObj.doProcess();
if (!stepOk)
{
Console.WriteLine("Errore in processing file");
}
else
{
importObj.doReturn();
}
}
else
{
Console.WriteLine("Errore in processing config file");
}
}
else
{
Console.WriteLine("Errore file non trovato!");
}
}
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<Configuration>Release</Configuration>
<Platform>Any CPU</Platform>
<PublishDir>bin\Release\net6.0\win-x64\publish\</PublishDir>
<PublishProtocol>FileSystem</PublishProtocol>
<_TargetId>Folder</_TargetId>
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<SelfContained>false</SelfContained>
<PublishSingleFile>true</PublishSingleFile>
<PublishReadyToRun>false</PublishReadyToRun>
</PropertyGroup>
</Project>
+4
View File
@@ -0,0 +1,4 @@
@echo off
REM compilo in publish
dotnet publish EgwCApp.ExcImport.csproj -p:PublishSingleFile=true -r win-x64 -c Release --self-contained false
+25
View File
@@ -0,0 +1,25 @@
{
"ArchiveDir": "C:\\temp\\import\\archive",
"ConvertDir": "C:\\temp\\import\\convert",
"FileInPath": "C:\\temp\\import\\01.12.xlsx",
"FileOutPath": "01.12.json",
"IdxODL": 987654321,
"ProcessParamInt": {
"Product": 3,
"Variety": 9,
"Supplier": 8,
"ExtDoc": 2,
"DateRif": 14,
"QtyTot": 22,
"NumPack": 21,
"NumPed": 17,
"PackPed": 18,
"PesoPack": 20
},
"ProcessParamStr": {},
"RedisDB": 0,
"RedisOut": "",
"Return": "File",
"TargetName": "DB Loco",
"Type": "Excel"
}
+6
View File
@@ -0,0 +1,6 @@
{
"FilePath": "C:\\Temp\\test.log",
"ProcessParams": {},
"Return": "Console",
"Type": "Excel"
}
@@ -0,0 +1,25 @@
{
"ArchiveDir": "C:\\temp\\import\\archive",
"ConvertDir": "C:\\temp\\import\\convert",
"FileInPath": "C:\\temp\\import\\01.12.xlsx",
"FileOutPath": "01.12.json",
"IdxODL": 987654321,
"ProcessParamInt": {
"Product": 3,
"Variety": 9,
"Supplier": 8,
"ExtDoc": 2,
"DateRif": 14,
"QtyTot": 22,
"NumPack": 21,
"NumPed": 17,
"PackPed": 18,
"PesoPack": 20
},
"ProcessParamStr": {},
"RedisDB": 0,
"RedisOut": "",
"Return": "File",
"TargetName": "DB Loco",
"Type": "Excel"
}
+9
View File
@@ -0,0 +1,9 @@
echo ------------ Parametri compilazione ------------
echo OutDir: $(OutDir)
echo Configuration: $(ConfigurationName)
echo ProjectDir: $(ProjectDir)
echo AssemblyName: $(AssemblyName)
echo TargetDir: $(TargetDir)
echo ------------ Parametri compilazione ------------
preBuild.bat $(SolutionDir)EgwCApp.ExcImport\EgwCApp.ExcImport.csproj $(SolutionDir)EgwCApp.ExcImport\bin\Release\net6.0\publish\win-x64\ $(ProjectDir)Utils
@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\EgwCApp.Core\EgwCApp.Core.csproj" />
<ProjectReference Include="..\EgwCApp.XmlProc\EgwCApp.XmlProc.csproj" />
</ItemGroup>
<ItemGroup>
<None Update="Tools\ExcImport.exe">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
+120
View File
@@ -0,0 +1,120 @@
using System;
using System.Collections.Generic;
using EgwCApp.Core;
using Newtonsoft.Json;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwCApp.XmlTesting
{
public class FileProcMan
{
#region Public Constructors
public FileProcMan(string toolDir, string exeFileName)
{
this.confFileName = "conf.json";
this.baseDir = toolDir;
this.exeName = exeFileName;
appPath = $"./{baseDir}/{exeName}";
}
#endregion Public Constructors
#region Public Methods
/// <summary>
/// Processa il singolo file e riporta tempo esecuzione
/// </summary>
/// <returns></returns>
public TimeSpan doProcess(string fPath)
{
TimeSpan outVal = new TimeSpan();
Stopwatch sw = new Stopwatch();
// preparo file conf
createConfFile(fPath);
// avvio processing
Console.WriteLine("calling ext app with args:");
Console.WriteLine($"{appPath} {confFileName}");
Console.WriteLine();
ProcessStartInfo psi = new ProcessStartInfo
{
FileName = appPath,
Arguments = $"{confFileName}",
WindowStyle = ProcessWindowStyle.Minimized,
//WindowStyle = ProcessWindowStyle.Hidden,
UseShellExecute = false,
//CreateNoWindow = true,
RedirectStandardOutput = true,
RedirectStandardInput = true,
};
sw.Start();
Process p = Process.Start(psi);
string q = "";
while (!p.HasExited)
{
q += p.StandardOutput.ReadToEnd();
}
sw.Stop();
outVal = sw.Elapsed;
return outVal;
}
#endregion Public Methods
#region Protected Fields
protected string appPath = "";
protected string baseDir = "";
protected string confFileName = "";
protected string exeName = "";
#endregion Protected Fields
#region Private Methods
private void createConfFile(string item)
{
Dictionary<string, int> importParams = new Dictionary<string, int>();
importParams.Add("Product", 3);
importParams.Add("Variety", 9);
importParams.Add("Supplier", 8);
importParams.Add("ExtDoc", 2);
importParams.Add("DateRif", 14);
importParams.Add("QtyTot", 22);
importParams.Add("NumPack", 21);
importParams.Add("NumPed", 17);
importParams.Add("PackPed", 18);
importParams.Add("PesoPack", 20);
// calcolo nome file conf specifico
string outFileName = Path.GetFileName(item).Replace("xlsx", "json");
confFileName = $"conf_{outFileName}";
// calcolo outFIleName
var newConf = new ConfigFile()
{
ArchiveDir = @"C:\temp\import\archive\",
ConvertDir = @"C:\temp\import\convert\",
Type = ImportType.Excel,
FileInPath = item,
FileOutPath = outFileName,
Return = ReturnMode.File,
ProcessParamInt = importParams,
TargetName = "DB Loco"
};
// serializzo e salvo!
var rawData = JsonConvert.SerializeObject(newConf, Formatting.Indented);
File.WriteAllText(confFileName, rawData);
}
#endregion Private Methods
}
}
+65
View File
@@ -0,0 +1,65 @@
// See https://aka.ms/new-console-template for more information
using EgwCApp.Core;
using System.Diagnostics;
using Newtonsoft.Json;
using EgwCApp.XmlTesting;
Dictionary<string, TimeSpan> statsColl = new Dictionary<string, TimeSpan>();
Stopwatch sw = new Stopwatch();
string separator = "--------------------------------------";
Console.WriteLine(separator);
Console.WriteLine("Console Test Application");
Console.WriteLine(separator);
Console.WriteLine();
// creo il file di configurazione...
string fileName = "conf.json";
ConfigFile newConf = new ConfigFile();
string rawData = "";
// test CSV
//newConf = new ConfigFile()
//{
// Type = ImportType.CSV,
// FileInPath = @"C:\Temp\test.log",
// Return = ReturnMode.Console
//};
// svuoto eventuali conf vecchi
var listaConf = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.json");
if (listaConf != null && listaConf.Count() > 0)
{
foreach (var file2del in listaConf)
{
File.Delete(file2del);
}
}
// cerco file xlsx e ciclo...
var listaFiles = Directory.GetFiles(@"C:\temp\import\", "*.xlsx");
if (listaFiles != null && listaFiles.Count() > 0)
{
FileProcMan fpm = new FileProcMan("Tools", "ExcImport.exe");
foreach (var item in listaFiles)
{
TimeSpan timeElaps = fpm.doProcess(item);
statsColl.Add($"Ext prog executed for {item}", timeElaps);
}
}
Console.WriteLine(separator);
Console.WriteLine("press enter to proceed...");
Console.ReadLine();
foreach (var item in statsColl)
{
Console.WriteLine($"{item.Key} {item.Value.TotalMilliseconds} ms");
}
//Console.WriteLine($"Display executed in {timeElaps.TotalMilliseconds} ms");
Console.ReadLine();
Binary file not shown.
+6
View File
@@ -0,0 +1,6 @@
@echo off
REM recupero versione compilata
ROBOCOPY %1 %2 *.exe /MIR
echo Eseguito restore CApp!
+28
View File
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>EgwProxy.Gomba</id>
<version>#version#</version>
<title>EgwProxy.Gomba</title>
<authors>Samuele E. Locatelli, EgalWare</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<description>Libreria per comunicazione con adapter SOAP XML delle bilance Gomba x scambio dati (IOB-WIN-NEXT) - beta/unstable</description>
<releaseNotes>#releaseNotes#</releaseNotes>
<copyright>#copyright#</copyright>
<tags>EgwProxy.Gomba EgwProxy Gomba</tags>
<dependencies>
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" />
<dependency id="System.Runtime.Serialization.Xml" version="4.3.0" />
<dependency id="System.ServiceModel.Http" version="4.6.0" />
<dependency id="System.ServiceModel.NetTcp" version="4.6.0" />
<dependency id="System.ServiceModel.Primitives" version="4.6.0" />
<dependency id="System.ServiceModel.Security" version="4.6.0" />
</dependencies>
</metadata>
<files>
<file src="EgwProxy.Gomba\bin\Debug\EgwProxy*.dll" target="lib" />
<file src="EgwProxy.Gomba\bin\Debug\EgwProxy*.config" target="lib" />
<file src="EgwProxy.Gomba\bin\Debug\EgwProxy*.pdb" target="lib" />
</files>
</package>
+27
View File
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>EgwProxy.Gomba</id>
<version>#version#</version>
<title>EgwProxy.Gomba</title>
<authors>Samuele E. Locatelli, EgalWare</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<description>Libreria per comunicazione con adapter SOAP XML delle bilance Gomba x scambio dati (IOB-WIN-NEXT)</description>
<releaseNotes>#releaseNotes#</releaseNotes>
<copyright>#copyright#</copyright>
<tags>EgwProxy.Gomba EgwProxy Gomba</tags>
<dependencies>
<dependency id="System.Runtime.Serialization.Primitives" version="4.3.0" />
<dependency id="System.Runtime.Serialization.Xml" version="4.3.0" />
<dependency id="System.ServiceModel.Http" version="4.6.0" />
<dependency id="System.ServiceModel.NetTcp" version="4.6.0" />
<dependency id="System.ServiceModel.Primitives" version="4.6.0" />
<dependency id="System.ServiceModel.Security" version="4.6.0" />
</dependencies>
</metadata>
<files>
<file src="EgwProxy.Gomba\bin\Release\EgwProxy*.dll" target="lib" />
<file src="EgwProxy.Gomba\bin\Release\EgwProxy*.config" target="lib" />
</files>
</package>
+21
View File
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="lwpServicePortBinding">
<security mode="Transport" />
</binding>
<binding name="lwpServicePortBinding1" />
</basicHttpBinding>
</bindings>
<client>
<endpoint address="https://308gomba:8000/ws" binding="basicHttpBinding"
bindingConfiguration="lwpServicePortBinding" contract="GombaServ.lwpService"
name="lwpServicePort" />
</client>
</system.serviceModel>
</configuration>
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2B7F1536-61D1-4F05-AF8D-62A52D114479}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>EgwProxy.Gomba.Test</RootNamespace>
<AssemblyName>EgwProxy.Gomba.Test</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EgwProxy.Gomba\EgwProxy.Gomba.csproj">
<Project>{cc377124-1b94-40c1-b552-d6d42eb2bf27}</Project>
<Name>EgwProxy.Gomba</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
+100
View File
@@ -0,0 +1,100 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.Gomba.Test
{
internal class Program
{
static void Main(string[] args)
{
// gestire da conf se saltare certificato
ServicePointManager.ServerCertificateValidationCallback = delegate { return true; };
string linea = "-----------------------------";
Console.WriteLine(linea);
Console.WriteLine("Test comunicazione Gomba");
Console.WriteLine(linea);
Console.WriteLine();
string escimi = "N";
// init proxy SOAP
GombaServ.lwpServiceClient gombaConn = new GombaServ.lwpServiceClient();
//GombaServ.lwpServiceClient gombaConn = new GombaServ.lwpServiceClient("lwpServicePortBinding", new System.ServiceModel.EndpointAddress("https://308gomba:8000/ws"));
Console.WriteLine("Premere un tasto per iniziare test.");
escimi = Console.ReadLine().ToUpper();
int idxReq = 10;
// lettura
while (escimi != "E")
{
string pesata = "";
Console.WriteLine($"{linea} {DateTime.Now:HH:mm:ss.fff} {linea}");
try
{
string dataFrom = "01/01/2023";
string dataTo = DateTime.Today.AddDays(1).ToString("dd/MM/yyyy");
var results = gombaConn.reqWeightList("ALL", dataFrom, dataTo);
foreach (var item in results)
{
pesata = $"rm: {item.rm} | DI: {item.dateIn} | DO: {item.dateOut} | BI: {item.balanceIn} | BO: {item.balanceOut} | WI: {item.weightIn} | WO: {item.weightOut} | Feed: {item.feedback} | note: {item.notes}";
//pesata = $"rm: {item.rm} | DI: {item.dateIn} | DO: {item.dateOut} | BI: {item.balanceIn} | BO: {item.balanceOut} | WI: {item.weightIn} | WO: {item.weightOut} | net: {item.net} | MI: {item.idMemIn} | MO: {item.idMemOut} | Feed: {item.feedback} | note: {item.notes}";
Console.WriteLine(pesata);
}
}
catch (Exception exc)
{
Console.WriteLine($"Errore:{Environment.NewLine}{exc}");
}
Console.WriteLine($"{linea} {DateTime.Now:HH:mm:ss.fff} {linea}");
Console.WriteLine();
Console.WriteLine();
Console.WriteLine();
Console.WriteLine("Cosa vuoi fare ora? I = pesata IN, O= pesata OUT, E = uscita, altrimenti rilettura");
escimi = Console.ReadLine().ToUpper();
DateTime adesso = DateTime.Now;
// invio pesata
if (escimi == "I")
{
try
{
var answ = gombaConn.memWeight("IN", $"ODL000000{idxReq}", "TEST", "INGRESSO", "15000", "PROVA IN", $"{adesso:yyyy/MM/dd}", $"{adesso:HH:mm:ss}");
bool pesoOk = answ.feedback == "C";
pesata = $"rm: {answ.rm} | DI: {answ.dateIn} | DO: {answ.dateOut} | BI: {answ.balanceIn} | BO: {answ.balanceOut} | WI: {answ.weightIn} | WO: {answ.weightOut} | Feed: {answ.feedback} | note: {answ.notes}";
Console.WriteLine(pesata);
Console.WriteLine();
}
catch (Exception exc)
{
Console.WriteLine($"Errore:{Environment.NewLine}{exc}");
}
}
else if (escimi == "O")
{
try
{
var answ = gombaConn.memWeight("OUT", $"ODL000000{idxReq}", "TEST", "USCITA", "15000", "PROVA OUT", $"{adesso:yyyy/MM/dd}", $"{adesso:HH:mm:ss}");
bool pesoOk = answ.feedback == "C";
pesata = $"rm: {answ.rm} | DI: {answ.dateIn} | DO: {answ.dateOut} | BI: {answ.balanceIn} | BO: {answ.balanceOut} | WI: {answ.weightIn} | WO: {answ.weightOut} | Feed: {answ.feedback} | note: {answ.notes}";
Console.WriteLine(pesata);
Console.WriteLine();
if (pesoOk)
{
idxReq++;
}
}
catch (Exception exc)
{
Console.WriteLine($"Errore:{Environment.NewLine}{exc}");
}
}
}
}
}
}
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("EgwProxy.Gomba.Test")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("EgwProxy.Gomba.Test")]
[assembly: AssemblyCopyright("Copyright © 2023")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("2b7f1536-61d1-4f05-af8d-62a52d114479")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
+31
View File
@@ -0,0 +1,31 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.2.32630.192
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwProxy.Gomba.Test", "EgwProxy.Gomba.Test\EgwProxy.Gomba.Test.csproj", "{2B7F1536-61D1-4F05-AF8D-62A52D114479}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwProxy.Gomba", "EgwProxy.Gomba\EgwProxy.Gomba.csproj", "{CC377124-1B94-40C1-B552-D6D42EB2BF27}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2B7F1536-61D1-4F05-AF8D-62A52D114479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B7F1536-61D1-4F05-AF8D-62A52D114479}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B7F1536-61D1-4F05-AF8D-62A52D114479}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B7F1536-61D1-4F05-AF8D-62A52D114479}.Release|Any CPU.Build.0 = Release|Any CPU
{CC377124-1B94-40C1-B552-D6D42EB2BF27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CC377124-1B94-40C1-B552-D6D42EB2BF27}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CC377124-1B94-40C1-B552-D6D42EB2BF27}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CC377124-1B94-40C1-B552-D6D42EB2BF27}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {DA96981F-F7D0-47A9-A51F-9BCC8D35619F}
EndGlobalSection
EndGlobal
+29
View File
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.serviceModel>
<bindings>
<basicHttpBinding>
<binding name="lwpServicePortBinding">
<security mode="Transport" />
</binding>
<binding name="lwpServicePortBinding1" />
</basicHttpBinding>
</bindings>
<client>
<endpoint address="https://308gomba:8000/ws" binding="basicHttpBinding"
bindingConfiguration="lwpServicePortBinding" contract="GombaServ.lwpService"
name="lwpServicePort" />
</client>
</system.serviceModel>
</configuration>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="gestWeightOut" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>EgwProxy.Gomba.GombaServ.gestWeightOut, Connected Services.GombaServ.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="memWeightResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>EgwProxy.Gomba.GombaServ.memWeightResponse, Connected Services.GombaServ.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="reqWeightListResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>EgwProxy.Gomba.GombaServ.reqWeightListResponse, Connected Services.GombaServ.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="reqWeightResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>EgwProxy.Gomba.GombaServ.reqWeightResponse, Connected Services.GombaServ.Reference.cs.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
@@ -0,0 +1,611 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace EgwProxy.Gomba.GombaServ {
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ServiceModel.ServiceContractAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", ConfigurationName="GombaServ.lwpService")]
public interface lwpService {
// CODEGEN: Parameter 'return' requires additional schema information that cannot be captured using the parameter mode. The specific attribute is 'System.Xml.Serialization.XmlElementAttribute'.
[System.ServiceModel.OperationContractAttribute(Action="http://servicesImpl.webServices.gomba.com/lwpService/memWeightRequest", ReplyAction="http://servicesImpl.webServices.gomba.com/lwpService/memWeightResponse")]
[System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
[return: System.ServiceModel.MessageParameterAttribute(Name="return")]
EgwProxy.Gomba.GombaServ.memWeightResponse memWeight(EgwProxy.Gomba.GombaServ.memWeightRequest request);
[System.ServiceModel.OperationContractAttribute(Action="http://servicesImpl.webServices.gomba.com/lwpService/memWeightRequest", ReplyAction="http://servicesImpl.webServices.gomba.com/lwpService/memWeightResponse")]
System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.memWeightResponse> memWeightAsync(EgwProxy.Gomba.GombaServ.memWeightRequest request);
// CODEGEN: Parameter 'return' requires additional schema information that cannot be captured using the parameter mode. The specific attribute is 'System.Xml.Serialization.XmlElementAttribute'.
[System.ServiceModel.OperationContractAttribute(Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightListRequest", ReplyAction="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightListResponse")]
[System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
[return: System.ServiceModel.MessageParameterAttribute(Name="return")]
EgwProxy.Gomba.GombaServ.reqWeightListResponse reqWeightList(EgwProxy.Gomba.GombaServ.reqWeightListRequest request);
[System.ServiceModel.OperationContractAttribute(Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightListRequest", ReplyAction="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightListResponse")]
System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.reqWeightListResponse> reqWeightListAsync(EgwProxy.Gomba.GombaServ.reqWeightListRequest request);
// CODEGEN: Parameter 'return' requires additional schema information that cannot be captured using the parameter mode. The specific attribute is 'System.Xml.Serialization.XmlElementAttribute'.
[System.ServiceModel.OperationContractAttribute(Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightRequest", ReplyAction="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightResponse")]
[System.ServiceModel.XmlSerializerFormatAttribute(SupportFaults=true)]
[return: System.ServiceModel.MessageParameterAttribute(Name="return")]
EgwProxy.Gomba.GombaServ.reqWeightResponse reqWeight(EgwProxy.Gomba.GombaServ.reqWeightRequest request);
[System.ServiceModel.OperationContractAttribute(Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightRequest", ReplyAction="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightResponse")]
System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.reqWeightResponse> reqWeightAsync(EgwProxy.Gomba.GombaServ.reqWeightRequest request);
}
/// <remarks/>
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.Xml", "4.8.3761.0")]
[System.SerializableAttribute()]
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.ComponentModel.DesignerCategoryAttribute("code")]
[System.Xml.Serialization.XmlTypeAttribute(Namespace="http://servicesImpl.webServices.gomba.com/")]
public partial class gestWeightOut : object, System.ComponentModel.INotifyPropertyChanged {
private string balanceInField;
private string balanceOutField;
private string cod1Field;
private string cod2Field;
private string cod3Field;
private string cod4Field;
private string cod5Field;
private string cod6Field;
private System.DateTime dateInField;
private bool dateInFieldSpecified;
private System.DateTime dateOutField;
private bool dateOutFieldSpecified;
private string feedbackField;
private string idMemInField;
private string idMemOutField;
private string netField;
private string notesField;
private string rmField;
private string weightInField;
private string weightOutField;
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=0)]
public string balanceIn {
get {
return this.balanceInField;
}
set {
this.balanceInField = value;
this.RaisePropertyChanged("balanceIn");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=1)]
public string balanceOut {
get {
return this.balanceOutField;
}
set {
this.balanceOutField = value;
this.RaisePropertyChanged("balanceOut");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=2)]
public string cod1 {
get {
return this.cod1Field;
}
set {
this.cod1Field = value;
this.RaisePropertyChanged("cod1");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=3)]
public string cod2 {
get {
return this.cod2Field;
}
set {
this.cod2Field = value;
this.RaisePropertyChanged("cod2");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=4)]
public string cod3 {
get {
return this.cod3Field;
}
set {
this.cod3Field = value;
this.RaisePropertyChanged("cod3");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=5)]
public string cod4 {
get {
return this.cod4Field;
}
set {
this.cod4Field = value;
this.RaisePropertyChanged("cod4");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=6)]
public string cod5 {
get {
return this.cod5Field;
}
set {
this.cod5Field = value;
this.RaisePropertyChanged("cod5");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=7)]
public string cod6 {
get {
return this.cod6Field;
}
set {
this.cod6Field = value;
this.RaisePropertyChanged("cod6");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=8)]
public System.DateTime dateIn {
get {
return this.dateInField;
}
set {
this.dateInField = value;
this.RaisePropertyChanged("dateIn");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlIgnoreAttribute()]
public bool dateInSpecified {
get {
return this.dateInFieldSpecified;
}
set {
this.dateInFieldSpecified = value;
this.RaisePropertyChanged("dateInSpecified");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=9)]
public System.DateTime dateOut {
get {
return this.dateOutField;
}
set {
this.dateOutField = value;
this.RaisePropertyChanged("dateOut");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlIgnoreAttribute()]
public bool dateOutSpecified {
get {
return this.dateOutFieldSpecified;
}
set {
this.dateOutFieldSpecified = value;
this.RaisePropertyChanged("dateOutSpecified");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=10)]
public string feedback {
get {
return this.feedbackField;
}
set {
this.feedbackField = value;
this.RaisePropertyChanged("feedback");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=11)]
public string idMemIn {
get {
return this.idMemInField;
}
set {
this.idMemInField = value;
this.RaisePropertyChanged("idMemIn");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=12)]
public string idMemOut {
get {
return this.idMemOutField;
}
set {
this.idMemOutField = value;
this.RaisePropertyChanged("idMemOut");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=13)]
public string net {
get {
return this.netField;
}
set {
this.netField = value;
this.RaisePropertyChanged("net");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=14)]
public string notes {
get {
return this.notesField;
}
set {
this.notesField = value;
this.RaisePropertyChanged("notes");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=15)]
public string rm {
get {
return this.rmField;
}
set {
this.rmField = value;
this.RaisePropertyChanged("rm");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=16)]
public string weightIn {
get {
return this.weightInField;
}
set {
this.weightInField = value;
this.RaisePropertyChanged("weightIn");
}
}
/// <remarks/>
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified, Order=17)]
public string weightOut {
get {
return this.weightOutField;
}
set {
this.weightOutField = value;
this.RaisePropertyChanged("weightOut");
}
}
public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
protected void RaisePropertyChanged(string propertyName) {
System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
if ((propertyChanged != null)) {
propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
}
}
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
[System.ServiceModel.MessageContractAttribute(WrapperName="memWeight", WrapperNamespace="http://servicesImpl.webServices.gomba.com/", IsWrapped=true)]
public partial class memWeightRequest {
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=0)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string type;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=1)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string rm;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=2)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string cod1;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=3)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string cod2;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=4)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string cod3;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=5)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string cod4;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=6)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string cod5;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=7)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string cod6;
public memWeightRequest() {
}
public memWeightRequest(string type, string rm, string cod1, string cod2, string cod3, string cod4, string cod5, string cod6) {
this.type = type;
this.rm = rm;
this.cod1 = cod1;
this.cod2 = cod2;
this.cod3 = cod3;
this.cod4 = cod4;
this.cod5 = cod5;
this.cod6 = cod6;
}
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
[System.ServiceModel.MessageContractAttribute(WrapperName="memWeightResponse", WrapperNamespace="http://servicesImpl.webServices.gomba.com/", IsWrapped=true)]
public partial class memWeightResponse {
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=0)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public EgwProxy.Gomba.GombaServ.gestWeightOut @return;
public memWeightResponse() {
}
public memWeightResponse(EgwProxy.Gomba.GombaServ.gestWeightOut @return) {
this.@return = @return;
}
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
[System.ServiceModel.MessageContractAttribute(WrapperName="reqWeightList", WrapperNamespace="http://servicesImpl.webServices.gomba.com/", IsWrapped=true)]
public partial class reqWeightListRequest {
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=0)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string type;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=1)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string dateStart;
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=2)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string dateEnd;
public reqWeightListRequest() {
}
public reqWeightListRequest(string type, string dateStart, string dateEnd) {
this.type = type;
this.dateStart = dateStart;
this.dateEnd = dateEnd;
}
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
[System.ServiceModel.MessageContractAttribute(WrapperName="reqWeightListResponse", WrapperNamespace="http://servicesImpl.webServices.gomba.com/", IsWrapped=true)]
public partial class reqWeightListResponse {
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=0)]
[System.Xml.Serialization.XmlElementAttribute("return", Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public EgwProxy.Gomba.GombaServ.gestWeightOut[] @return;
public reqWeightListResponse() {
}
public reqWeightListResponse(EgwProxy.Gomba.GombaServ.gestWeightOut[] @return) {
this.@return = @return;
}
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
[System.ServiceModel.MessageContractAttribute(WrapperName="reqWeight", WrapperNamespace="http://servicesImpl.webServices.gomba.com/", IsWrapped=true)]
public partial class reqWeightRequest {
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=0)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public string rm;
public reqWeightRequest() {
}
public reqWeightRequest(string rm) {
this.rm = rm;
}
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
[System.ServiceModel.MessageContractAttribute(WrapperName="reqWeightResponse", WrapperNamespace="http://servicesImpl.webServices.gomba.com/", IsWrapped=true)]
public partial class reqWeightResponse {
[System.ServiceModel.MessageBodyMemberAttribute(Namespace="http://servicesImpl.webServices.gomba.com/", Order=0)]
[System.Xml.Serialization.XmlElementAttribute(Form=System.Xml.Schema.XmlSchemaForm.Unqualified)]
public EgwProxy.Gomba.GombaServ.gestWeightOut @return;
public reqWeightResponse() {
}
public reqWeightResponse(EgwProxy.Gomba.GombaServ.gestWeightOut @return) {
this.@return = @return;
}
}
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
public interface lwpServiceChannel : EgwProxy.Gomba.GombaServ.lwpService, System.ServiceModel.IClientChannel {
}
[System.Diagnostics.DebuggerStepThroughAttribute()]
[System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
public partial class lwpServiceClient : System.ServiceModel.ClientBase<EgwProxy.Gomba.GombaServ.lwpService>, EgwProxy.Gomba.GombaServ.lwpService {
public lwpServiceClient() {
}
public lwpServiceClient(string endpointConfigurationName) :
base(endpointConfigurationName) {
}
public lwpServiceClient(string endpointConfigurationName, string remoteAddress) :
base(endpointConfigurationName, remoteAddress) {
}
public lwpServiceClient(string endpointConfigurationName, System.ServiceModel.EndpointAddress remoteAddress) :
base(endpointConfigurationName, remoteAddress) {
}
public lwpServiceClient(System.ServiceModel.Channels.Binding binding, System.ServiceModel.EndpointAddress remoteAddress) :
base(binding, remoteAddress) {
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
EgwProxy.Gomba.GombaServ.memWeightResponse EgwProxy.Gomba.GombaServ.lwpService.memWeight(EgwProxy.Gomba.GombaServ.memWeightRequest request) {
return base.Channel.memWeight(request);
}
public EgwProxy.Gomba.GombaServ.gestWeightOut memWeight(string type, string rm, string cod1, string cod2, string cod3, string cod4, string cod5, string cod6) {
EgwProxy.Gomba.GombaServ.memWeightRequest inValue = new EgwProxy.Gomba.GombaServ.memWeightRequest();
inValue.type = type;
inValue.rm = rm;
inValue.cod1 = cod1;
inValue.cod2 = cod2;
inValue.cod3 = cod3;
inValue.cod4 = cod4;
inValue.cod5 = cod5;
inValue.cod6 = cod6;
EgwProxy.Gomba.GombaServ.memWeightResponse retVal = ((EgwProxy.Gomba.GombaServ.lwpService)(this)).memWeight(inValue);
return retVal.@return;
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.memWeightResponse> EgwProxy.Gomba.GombaServ.lwpService.memWeightAsync(EgwProxy.Gomba.GombaServ.memWeightRequest request) {
return base.Channel.memWeightAsync(request);
}
public System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.memWeightResponse> memWeightAsync(string type, string rm, string cod1, string cod2, string cod3, string cod4, string cod5, string cod6) {
EgwProxy.Gomba.GombaServ.memWeightRequest inValue = new EgwProxy.Gomba.GombaServ.memWeightRequest();
inValue.type = type;
inValue.rm = rm;
inValue.cod1 = cod1;
inValue.cod2 = cod2;
inValue.cod3 = cod3;
inValue.cod4 = cod4;
inValue.cod5 = cod5;
inValue.cod6 = cod6;
return ((EgwProxy.Gomba.GombaServ.lwpService)(this)).memWeightAsync(inValue);
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
EgwProxy.Gomba.GombaServ.reqWeightListResponse EgwProxy.Gomba.GombaServ.lwpService.reqWeightList(EgwProxy.Gomba.GombaServ.reqWeightListRequest request) {
return base.Channel.reqWeightList(request);
}
public EgwProxy.Gomba.GombaServ.gestWeightOut[] reqWeightList(string type, string dateStart, string dateEnd) {
EgwProxy.Gomba.GombaServ.reqWeightListRequest inValue = new EgwProxy.Gomba.GombaServ.reqWeightListRequest();
inValue.type = type;
inValue.dateStart = dateStart;
inValue.dateEnd = dateEnd;
EgwProxy.Gomba.GombaServ.reqWeightListResponse retVal = ((EgwProxy.Gomba.GombaServ.lwpService)(this)).reqWeightList(inValue);
return retVal.@return;
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.reqWeightListResponse> EgwProxy.Gomba.GombaServ.lwpService.reqWeightListAsync(EgwProxy.Gomba.GombaServ.reqWeightListRequest request) {
return base.Channel.reqWeightListAsync(request);
}
public System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.reqWeightListResponse> reqWeightListAsync(string type, string dateStart, string dateEnd) {
EgwProxy.Gomba.GombaServ.reqWeightListRequest inValue = new EgwProxy.Gomba.GombaServ.reqWeightListRequest();
inValue.type = type;
inValue.dateStart = dateStart;
inValue.dateEnd = dateEnd;
return ((EgwProxy.Gomba.GombaServ.lwpService)(this)).reqWeightListAsync(inValue);
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
EgwProxy.Gomba.GombaServ.reqWeightResponse EgwProxy.Gomba.GombaServ.lwpService.reqWeight(EgwProxy.Gomba.GombaServ.reqWeightRequest request) {
return base.Channel.reqWeight(request);
}
public EgwProxy.Gomba.GombaServ.gestWeightOut reqWeight(string rm) {
EgwProxy.Gomba.GombaServ.reqWeightRequest inValue = new EgwProxy.Gomba.GombaServ.reqWeightRequest();
inValue.rm = rm;
EgwProxy.Gomba.GombaServ.reqWeightResponse retVal = ((EgwProxy.Gomba.GombaServ.lwpService)(this)).reqWeight(inValue);
return retVal.@return;
}
[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.reqWeightResponse> EgwProxy.Gomba.GombaServ.lwpService.reqWeightAsync(EgwProxy.Gomba.GombaServ.reqWeightRequest request) {
return base.Channel.reqWeightAsync(request);
}
public System.Threading.Tasks.Task<EgwProxy.Gomba.GombaServ.reqWeightResponse> reqWeightAsync(string rm) {
EgwProxy.Gomba.GombaServ.reqWeightRequest inValue = new EgwProxy.Gomba.GombaServ.reqWeightRequest();
inValue.rm = rm;
return ((EgwProxy.Gomba.GombaServ.lwpService)(this)).reqWeightAsync(inValue);
}
}
}
@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<ReferenceGroup xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ID="79647293-8e4c-48a5-a0d7-4baf3f694853" xmlns="urn:schemas-microsoft-com:xml-wcfservicemap">
<ClientOptions>
<GenerateAsynchronousMethods>false</GenerateAsynchronousMethods>
<GenerateTaskBasedAsynchronousMethod>true</GenerateTaskBasedAsynchronousMethod>
<EnableDataBinding>true</EnableDataBinding>
<ExcludedTypes />
<ImportXmlTypes>false</ImportXmlTypes>
<GenerateInternalTypes>false</GenerateInternalTypes>
<GenerateMessageContracts>false</GenerateMessageContracts>
<NamespaceMappings />
<CollectionMappings />
<GenerateSerializableTypes>true</GenerateSerializableTypes>
<Serializer>Auto</Serializer>
<UseSerializerForFaults>true</UseSerializerForFaults>
<ReferenceAllAssemblies>true</ReferenceAllAssemblies>
<ReferencedAssemblies />
<ReferencedDataContractTypes />
<ServiceContractMappings />
</ClientOptions>
<MetadataSources>
<MetadataSource Address="https://308gomba:8000/ws?wsdl" Protocol="http" SourceId="1" />
</MetadataSources>
<Metadata>
<MetadataFile FileName="ws.xsd" MetadataType="Schema" ID="b430ce0c-e01d-46be-b5cc-fe061743f059" SourceId="1" SourceUrl="https://308gomba:8000/ws?xsd=1" />
<MetadataFile FileName="lwpService.wsdl" MetadataType="Wsdl" ID="975f05ee-1558-4bb6-9861-2455f688e911" SourceId="1" SourceUrl="https://308gomba:8000/ws?wsdl" />
</Metadata>
<Extensions>
<ExtensionFile FileName="configuration91.svcinfo" Name="configuration91.svcinfo" />
<ExtensionFile FileName="configuration.svcinfo" Name="configuration.svcinfo" />
</Extensions>
</ReferenceGroup>
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configurationSnapshot xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:schemas-microsoft-com:xml-wcfconfigurationsnapshot">
<behaviors />
<bindings>
<binding digest="System.ServiceModel.Configuration.BasicHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;lwpServicePortBinding&quot;&gt;&lt;security mode=&quot;Transport&quot; /&gt;&lt;/Data&gt;" bindingType="basicHttpBinding" name="lwpServicePortBinding" />
<binding digest="System.ServiceModel.Configuration.BasicHttpBindingElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089:&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data name=&quot;lwpServicePortBinding1&quot; /&gt;" bindingType="basicHttpBinding" name="lwpServicePortBinding1" />
</bindings>
<endpoints>
<endpoint normalizedDigest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;https://308gomba:8000/ws&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;lwpServicePortBinding&quot; contract=&quot;GombaServ.lwpService&quot; name=&quot;lwpServicePort&quot; /&gt;" digest="&lt;?xml version=&quot;1.0&quot; encoding=&quot;utf-16&quot;?&gt;&lt;Data address=&quot;https://308gomba:8000/ws&quot; binding=&quot;basicHttpBinding&quot; bindingConfiguration=&quot;lwpServicePortBinding&quot; contract=&quot;GombaServ.lwpService&quot; name=&quot;lwpServicePort&quot; /&gt;" contractName="GombaServ.lwpService" name="lwpServicePort" />
</endpoints>
</configurationSnapshot>
@@ -0,0 +1,310 @@
<?xml version="1.0" encoding="utf-8"?>
<SavedWcfConfigurationInformation xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Version="9.1" CheckSum="ETLHBUyFwK/hFPj9qQChVPXHjqFMxS4Tjq7vx1WkBI8=">
<bindingConfigurations>
<bindingConfiguration bindingType="basicHttpBinding" name="lwpServicePortBinding">
<properties>
<property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>lwpServicePortBinding</serializedValue>
</property>
<property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/openTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/receiveTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/sendTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/allowCookies" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/bypassProxyOnLocal" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/hostNameComparisonMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HostNameComparisonMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>StrongWildcard</serializedValue>
</property>
<property path="/maxBufferPoolSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/maxBufferSize" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>65536</serializedValue>
</property>
<property path="/maxReceivedMessageSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/proxyAddress" isComplexType="false" isExplicitlyDefined="false" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/readerQuotas" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement</serializedValue>
</property>
<property path="/readerQuotas/maxDepth" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/readerQuotas/maxStringContentLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/readerQuotas/maxArrayLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/readerQuotas/maxBytesPerRead" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/readerQuotas/maxNameTableCharCount" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/textEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.Text.Encoding, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.Text.UTF8Encoding</serializedValue>
</property>
<property path="/transferMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.TransferMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Buffered</serializedValue>
</property>
<property path="/useDefaultWebProxy" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/messageEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.WSMessageEncoding, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Text</serializedValue>
</property>
<property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.BasicHttpSecurityElement</serializedValue>
</property>
<property path="/security/mode" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.BasicHttpSecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Transport</serializedValue>
</property>
<property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.HttpTransportSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.HttpTransportSecurityElement</serializedValue>
</property>
<property path="/security/transport/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpClientCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>None</serializedValue>
</property>
<property path="/security/transport/proxyCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpProxyCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>None</serializedValue>
</property>
<property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement</serializedValue>
</property>
<property path="/security/transport/extendedProtectionPolicy/policyEnforcement" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.PolicyEnforcement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Never</serializedValue>
</property>
<property path="/security/transport/extendedProtectionPolicy/protectionScenario" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.ProtectionScenario, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>TransportSelected</serializedValue>
</property>
<property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>(Collection)</serializedValue>
</property>
<property path="/security/transport/realm" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpMessageSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.BasicHttpMessageSecurityElement</serializedValue>
</property>
<property path="/security/message/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpMessageCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>UserName</serializedValue>
</property>
<property path="/security/message/algorithmSuite" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.Security.SecurityAlgorithmSuite, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Default</serializedValue>
</property>
</properties>
</bindingConfiguration>
<bindingConfiguration bindingType="basicHttpBinding" name="lwpServicePortBinding1">
<properties>
<property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>lwpServicePortBinding1</serializedValue>
</property>
<property path="/closeTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/openTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/receiveTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/sendTimeout" isComplexType="false" isExplicitlyDefined="true" clrType="System.TimeSpan, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/allowCookies" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/bypassProxyOnLocal" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/hostNameComparisonMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HostNameComparisonMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>StrongWildcard</serializedValue>
</property>
<property path="/maxBufferPoolSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/maxBufferSize" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>65536</serializedValue>
</property>
<property path="/maxReceivedMessageSize" isComplexType="false" isExplicitlyDefined="true" clrType="System.Int64, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/proxyAddress" isComplexType="false" isExplicitlyDefined="false" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/readerQuotas" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.XmlDictionaryReaderQuotasElement</serializedValue>
</property>
<property path="/readerQuotas/maxDepth" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/readerQuotas/maxStringContentLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/readerQuotas/maxArrayLength" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/readerQuotas/maxBytesPerRead" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/readerQuotas/maxNameTableCharCount" isComplexType="false" isExplicitlyDefined="false" clrType="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>0</serializedValue>
</property>
<property path="/textEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.Text.Encoding, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.Text.UTF8Encoding</serializedValue>
</property>
<property path="/transferMode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.TransferMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Buffered</serializedValue>
</property>
<property path="/useDefaultWebProxy" isComplexType="false" isExplicitlyDefined="true" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/messageEncoding" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.WSMessageEncoding, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Text</serializedValue>
</property>
<property path="/security" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.BasicHttpSecurityElement</serializedValue>
</property>
<property path="/security/mode" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpSecurityMode, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>None</serializedValue>
</property>
<property path="/security/transport" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.HttpTransportSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.HttpTransportSecurityElement</serializedValue>
</property>
<property path="/security/transport/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpClientCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>None</serializedValue>
</property>
<property path="/security/transport/proxyCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.HttpProxyCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>None</serializedValue>
</property>
<property path="/security/transport/extendedProtectionPolicy" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.Security.Authentication.ExtendedProtection.Configuration.ExtendedProtectionPolicyElement</serializedValue>
</property>
<property path="/security/transport/extendedProtectionPolicy/policyEnforcement" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.PolicyEnforcement, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Never</serializedValue>
</property>
<property path="/security/transport/extendedProtectionPolicy/protectionScenario" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.ProtectionScenario, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>TransportSelected</serializedValue>
</property>
<property path="/security/transport/extendedProtectionPolicy/customServiceNames" isComplexType="true" isExplicitlyDefined="false" clrType="System.Security.Authentication.ExtendedProtection.Configuration.ServiceNameElementCollection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>(Collection)</serializedValue>
</property>
<property path="/security/transport/realm" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/security/message" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.BasicHttpMessageSecurityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.BasicHttpMessageSecurityElement</serializedValue>
</property>
<property path="/security/message/clientCredentialType" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.BasicHttpMessageCredentialType, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>UserName</serializedValue>
</property>
<property path="/security/message/algorithmSuite" isComplexType="false" isExplicitlyDefined="false" clrType="System.ServiceModel.Security.SecurityAlgorithmSuite, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>Default</serializedValue>
</property>
</properties>
</bindingConfiguration>
</bindingConfigurations>
<endpoints>
<endpoint name="lwpServicePort" contract="GombaServ.lwpService" bindingType="basicHttpBinding" address="https://308gomba:8000/ws" bindingConfiguration="lwpServicePortBinding">
<properties>
<property path="/address" isComplexType="false" isExplicitlyDefined="true" clrType="System.Uri, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>https://308gomba:8000/ws</serializedValue>
</property>
<property path="/behaviorConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/binding" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>basicHttpBinding</serializedValue>
</property>
<property path="/bindingConfiguration" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>lwpServicePortBinding</serializedValue>
</property>
<property path="/contract" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>GombaServ.lwpService</serializedValue>
</property>
<property path="/headers" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.AddressHeaderCollectionElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.AddressHeaderCollectionElement</serializedValue>
</property>
<property path="/headers/headers" isComplexType="false" isExplicitlyDefined="true" clrType="System.ServiceModel.Channels.AddressHeaderCollection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>&lt;Header /&gt;</serializedValue>
</property>
<property path="/identity" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.IdentityElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.IdentityElement</serializedValue>
</property>
<property path="/identity/userPrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.UserPrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.UserPrincipalNameElement</serializedValue>
</property>
<property path="/identity/userPrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/identity/servicePrincipalName" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.ServicePrincipalNameElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.ServicePrincipalNameElement</serializedValue>
</property>
<property path="/identity/servicePrincipalName/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/identity/dns" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.DnsElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.DnsElement</serializedValue>
</property>
<property path="/identity/dns/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/identity/rsa" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.RsaElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.RsaElement</serializedValue>
</property>
<property path="/identity/rsa/value" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/identity/certificate" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.CertificateElement</serializedValue>
</property>
<property path="/identity/certificate/encodedValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/identity/certificateReference" isComplexType="true" isExplicitlyDefined="false" clrType="System.ServiceModel.Configuration.CertificateReferenceElement, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>System.ServiceModel.Configuration.CertificateReferenceElement</serializedValue>
</property>
<property path="/identity/certificateReference/storeName" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreName, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>My</serializedValue>
</property>
<property path="/identity/certificateReference/storeLocation" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.StoreLocation, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>LocalMachine</serializedValue>
</property>
<property path="/identity/certificateReference/x509FindType" isComplexType="false" isExplicitlyDefined="false" clrType="System.Security.Cryptography.X509Certificates.X509FindType, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>FindBySubjectDistinguishedName</serializedValue>
</property>
<property path="/identity/certificateReference/findValue" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/identity/certificateReference/isChainIncluded" isComplexType="false" isExplicitlyDefined="false" clrType="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>False</serializedValue>
</property>
<property path="/name" isComplexType="false" isExplicitlyDefined="true" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue>lwpServicePort</serializedValue>
</property>
<property path="/kind" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
<property path="/endpointConfiguration" isComplexType="false" isExplicitlyDefined="false" clrType="System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<serializedValue />
</property>
</properties>
</endpoint>
</endpoints>
</SavedWcfConfigurationInformation>
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8"?>
<definitions xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://servicesImpl.webServices.gomba.com/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="lwpService" targetNamespace="http://servicesImpl.webServices.gomba.com/" xmlns="http://schemas.xmlsoap.org/wsdl/">
<types>
<xsd:schema>
<xsd:import schemaLocation="https://308gomba:8000/ws?xsd=1" namespace="http://servicesImpl.webServices.gomba.com/" />
</xsd:schema>
</types>
<message name="memWeight">
<part name="parameters" element="tns:memWeight" />
</message>
<message name="memWeightResponse">
<part name="parameters" element="tns:memWeightResponse" />
</message>
<message name="reqWeightList">
<part name="parameters" element="tns:reqWeightList" />
</message>
<message name="reqWeightListResponse">
<part name="parameters" element="tns:reqWeightListResponse" />
</message>
<message name="reqWeight">
<part name="parameters" element="tns:reqWeight" />
</message>
<message name="reqWeightResponse">
<part name="parameters" element="tns:reqWeightResponse" />
</message>
<portType name="lwpService">
<operation name="memWeight">
<input wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/memWeightRequest" message="tns:memWeight" />
<output wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/memWeightResponse" message="tns:memWeightResponse" />
</operation>
<operation name="reqWeightList">
<input wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightListRequest" message="tns:reqWeightList" />
<output wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightListResponse" message="tns:reqWeightListResponse" />
</operation>
<operation name="reqWeight">
<input wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightRequest" message="tns:reqWeight" />
<output wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightResponse" message="tns:reqWeightResponse" />
</operation>
</portType>
<binding name="lwpServicePortBinding" type="tns:lwpService">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
<operation name="memWeight">
<soap:operation soapAction="" />
<input>
<soap:body use="literal" />
</input>
<output>
<soap:body use="literal" />
</output>
</operation>
<operation name="reqWeightList">
<soap:operation soapAction="" />
<input>
<soap:body use="literal" />
</input>
<output>
<soap:body use="literal" />
</output>
</operation>
<operation name="reqWeight">
<soap:operation soapAction="" />
<input>
<soap:body use="literal" />
</input>
<output>
<soap:body use="literal" />
</output>
</operation>
</binding>
<service name="lwpService">
<port name="lwpServicePort" binding="tns:lwpServicePortBinding">
<soap:address location="https://308gomba:8000/ws" />
</port>
</service>
</definitions>
@@ -0,0 +1,70 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:tns="http://servicesImpl.webServices.gomba.com/" targetNamespace="http://servicesImpl.webServices.gomba.com/" version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="memWeight" type="tns:memWeight" />
<xs:element name="memWeightResponse" type="tns:memWeightResponse" />
<xs:element name="reqWeight" type="tns:reqWeight" />
<xs:element name="reqWeightList" type="tns:reqWeightList" />
<xs:element name="reqWeightListResponse" type="tns:reqWeightListResponse" />
<xs:element name="reqWeightResponse" type="tns:reqWeightResponse" />
<xs:complexType name="memWeight">
<xs:sequence>
<xs:element name="type" type="xs:string" />
<xs:element name="rm" type="xs:string" />
<xs:element minOccurs="0" name="cod1" type="xs:string" />
<xs:element minOccurs="0" name="cod2" type="xs:string" />
<xs:element minOccurs="0" name="cod3" type="xs:string" />
<xs:element minOccurs="0" name="cod4" type="xs:string" />
<xs:element minOccurs="0" name="cod5" type="xs:string" />
<xs:element minOccurs="0" name="cod6" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="memWeightResponse">
<xs:sequence>
<xs:element minOccurs="0" name="return" type="tns:gestWeightOut" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="gestWeightOut">
<xs:sequence>
<xs:element minOccurs="0" name="balanceIn" type="xs:string" />
<xs:element minOccurs="0" name="balanceOut" type="xs:string" />
<xs:element minOccurs="0" name="cod1" type="xs:string" />
<xs:element minOccurs="0" name="cod2" type="xs:string" />
<xs:element minOccurs="0" name="cod3" type="xs:string" />
<xs:element minOccurs="0" name="cod4" type="xs:string" />
<xs:element minOccurs="0" name="cod5" type="xs:string" />
<xs:element minOccurs="0" name="cod6" type="xs:string" />
<xs:element minOccurs="0" name="dateIn" type="xs:dateTime" />
<xs:element minOccurs="0" name="dateOut" type="xs:dateTime" />
<xs:element minOccurs="0" name="feedback" type="xs:string" />
<xs:element minOccurs="0" name="idMemIn" type="xs:string" />
<xs:element minOccurs="0" name="idMemOut" type="xs:string" />
<xs:element minOccurs="0" name="net" type="xs:string" />
<xs:element minOccurs="0" name="notes" type="xs:string" />
<xs:element name="rm" type="xs:string" />
<xs:element minOccurs="0" name="weightIn" type="xs:string" />
<xs:element minOccurs="0" name="weightOut" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="reqWeight">
<xs:sequence>
<xs:element name="rm" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="reqWeightResponse">
<xs:sequence>
<xs:element minOccurs="0" name="return" type="tns:gestWeightOut" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="reqWeightList">
<xs:sequence>
<xs:element name="type" type="xs:string" />
<xs:element name="dateStart" type="xs:string" />
<xs:element name="dateEnd" type="xs:string" />
</xs:sequence>
</xs:complexType>
<xs:complexType name="reqWeightListResponse">
<xs:sequence>
<xs:element minOccurs="0" maxOccurs="unbounded" name="return" type="tns:gestWeightOut" />
</xs:sequence>
</xs:complexType>
</xs:schema>
+116
View File
@@ -0,0 +1,116 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{CC377124-1B94-40C1-B552-D6D42EB2BF27}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>EgwProxy.Gomba</RootNamespace>
<AssemblyName>EgwProxy.Gomba</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Primitives, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.Serialization.Primitives.4.3.0\lib\net46\System.Runtime.Serialization.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization.Xml, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.Serialization.Xml.4.3.0\lib\net46\System.Runtime.Serialization.Xml.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Http, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.ServiceModel.Http.4.6.0\lib\net461\System.ServiceModel.Http.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel.NetTcp, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.ServiceModel.NetTcp.4.6.0\lib\net461\System.ServiceModel.NetTcp.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel.Primitives, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.ServiceModel.Primitives.4.6.0\lib\net461\System.ServiceModel.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel.Security, Version=4.6.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.ServiceModel.Security.4.6.0\lib\net461\System.ServiceModel.Security.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Connected Services\GombaServ\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Reference.svcmap</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="Connected Services\GombaServ\EgwProxy.Gomba.GombaServ.gestWeightOut.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\GombaServ\EgwProxy.Gomba.GombaServ.memWeightResponse.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\GombaServ\EgwProxy.Gomba.GombaServ.reqWeightListResponse.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\GombaServ\EgwProxy.Gomba.GombaServ.reqWeightResponse.datasource">
<DependentUpon>Reference.svcmap</DependentUpon>
</None>
<None Include="Connected Services\GombaServ\lwpService.wsdl" />
<None Include="Connected Services\GombaServ\ws.xsd">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<ItemGroup>
<WCFMetadataStorage Include="Connected Services\GombaServ\" />
</ItemGroup>
<ItemGroup>
<None Include="Connected Services\GombaServ\configuration91.svcinfo" />
</ItemGroup>
<ItemGroup>
<None Include="Connected Services\GombaServ\configuration.svcinfo" />
</ItemGroup>
<ItemGroup>
<None Include="Connected Services\GombaServ\Reference.svcmap">
<Generator>WCF Proxy Generator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
+76
View File
@@ -0,0 +1,76 @@
<!-- Published by JAX-WS RI (http://jax-ws.java.net). RI's version is JAX-WS RI 2.2.9-b130926.1035 svn-revision#5f6196f2b90e9460065a4c2f4e30e065b245e51e. -->
<!-- Generated by JAX-WS RI (http://jax-ws.java.net). RI's version is JAX-WS RI 2.2.9-b130926.1035 svn-revision#5f6196f2b90e9460065a4c2f4e30e065b245e51e. -->
<definitions xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsp1_2="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://servicesImpl.webServices.gomba.com/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/" targetNamespace="http://servicesImpl.webServices.gomba.com/" name="lwpService">
<types>
<xsd:schema>
<xsd:import namespace="http://servicesImpl.webServices.gomba.com/" schemaLocation="https://308gomba:8000/ws?xsd=1"/>
</xsd:schema>
</types>
<message name="reqWeightList">
<part name="parameters" element="tns:reqWeightList"/>
</message>
<message name="reqWeightListResponse">
<part name="parameters" element="tns:reqWeightListResponse"/>
</message>
<message name="memWeight">
<part name="parameters" element="tns:memWeight"/>
</message>
<message name="memWeightResponse">
<part name="parameters" element="tns:memWeightResponse"/>
</message>
<message name="reqWeight">
<part name="parameters" element="tns:reqWeight"/>
</message>
<message name="reqWeightResponse">
<part name="parameters" element="tns:reqWeightResponse"/>
</message>
<portType name="lwpService">
<operation name="reqWeightList">
<input wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightListRequest" message="tns:reqWeightList"/>
<output wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightListResponse" message="tns:reqWeightListResponse"/>
</operation>
<operation name="memWeight">
<input wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/memWeightRequest" message="tns:memWeight"/>
<output wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/memWeightResponse" message="tns:memWeightResponse"/>
</operation>
<operation name="reqWeight">
<input wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightRequest" message="tns:reqWeight"/>
<output wsam:Action="http://servicesImpl.webServices.gomba.com/lwpService/reqWeightResponse" message="tns:reqWeightResponse"/>
</operation>
</portType>
<binding name="lwpServicePortBinding" type="tns:lwpService">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
<operation name="reqWeightList">
<soap:operation soapAction=""/>
<input>
<soap:body use="literal"/>
</input>
<output>
<soap:body use="literal"/>
</output>
</operation>
<operation name="memWeight">
<soap:operation soapAction=""/>
<input>
<soap:body use="literal"/>
</input>
<output>
<soap:body use="literal"/>
</output>
</operation>
<operation name="reqWeight">
<soap:operation soapAction=""/>
<input>
<soap:body use="literal"/>
</input>
<output>
<soap:body use="literal"/>
</output>
</operation>
</binding>
<service name="lwpService">
<port name="lwpServicePort" binding="tns:lwpServicePortBinding">
<soap:address location="https://308gomba:8000/ws"/>
</port>
</service>
</definitions>
+36
View File
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("EgwProxy.Gomba")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("EgwProxy.Gomba")]
[assembly: AssemblyCopyright("Copyright © 2023")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("cc377124-1b94-40c1-b552-d6d42eb2bf27")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.Runtime.Serialization.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Runtime.Serialization.Xml" version="4.3.0" targetFramework="net462" />
<package id="System.ServiceModel.Http" version="4.6.0" targetFramework="net462" />
<package id="System.ServiceModel.NetTcp" version="4.6.0" targetFramework="net462" />
<package id="System.ServiceModel.Primitives" version="4.6.0" targetFramework="net462" />
<package id="System.ServiceModel.Security" version="4.6.0" targetFramework="net462" />
</packages>
-26
View File
@@ -16,31 +16,5 @@
<add name="SyncState" connectionString="data source=localhost\sqlexpress;initial catalog=MoonPro_ISF;persist security info=True;user id=egalware;password=egalware2022;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
@@ -34,48 +34,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Reference Include="Azure.Core, Version=1.6.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Core.1.6.0\lib\net461\Azure.Core.dll</HintPath>
</Reference>
<Reference Include="Azure.Identity, Version=1.3.0.0, Culture=neutral, PublicKeyToken=92742159e12e44c8, processorArchitecture=MSIL">
<HintPath>..\packages\Azure.Identity.1.3.0\lib\netstandard2.0\Azure.Identity.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.SqlClient, Version=4.1.0.0, Culture=neutral, PublicKeyToken=23ec7fc2d6eaa4a5, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Data.SqlClient.4.1.1\lib\net461\Microsoft.Data.SqlClient.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Identity.Client, Version=4.22.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Identity.Client.4.22.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Identity.Client.Extensions.Msal, Version=2.16.5.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Identity.Client.Extensions.Msal.2.16.5\lib\net45\Microsoft.Identity.Client.Extensions.Msal.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.JsonWebTokens.6.8.0\lib\net461\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Logging, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Logging.6.8.0\lib\net461\Microsoft.IdentityModel.Logging.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Protocols, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Protocols.6.8.0\lib\net461\Microsoft.IdentityModel.Protocols.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.6.8.0\lib\net461\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
</Reference>
<Reference Include="Microsoft.IdentityModel.Tokens, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.IdentityModel.Tokens.6.8.0\lib\net461\Microsoft.IdentityModel.Tokens.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.9\lib\net45\NLog.dll</HintPath>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.2.3\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -83,43 +53,36 @@
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Configuration.ConfigurationManager, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Configuration.ConfigurationManager.5.0.0\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.IdentityModel" />
<Reference Include="System.IdentityModel.Tokens.Jwt, Version=6.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\System.IdentityModel.Tokens.Jwt.6.8.0\lib\net461\System.IdentityModel.Tokens.Jwt.dll</HintPath>
</Reference>
<Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll</HintPath>
<Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.6.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Security.AccessControl, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.5.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
<Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
@@ -127,26 +90,11 @@
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.ProtectedData, Version=4.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.ProtectedData.4.5.0\lib\net461\System.Security.Cryptography.ProtectedData.dll</HintPath>
</Reference>
<Reference Include="System.Security.Permissions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Permissions.5.0.0\lib\net461\System.Security.Permissions.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.2\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
@@ -186,7 +134,5 @@
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.Data.SqlClient.SNI.4.0.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Data.SqlClient.SNI.4.0.1\build\net46\Microsoft.Data.SqlClient.SNI.targets'))" />
</Target>
<Import Project="..\packages\Microsoft.Data.SqlClient.SNI.4.0.1\build\net46\Microsoft.Data.SqlClient.SNI.targets" Condition="Exists('..\packages\Microsoft.Data.SqlClient.SNI.4.0.1\build\net46\Microsoft.Data.SqlClient.SNI.targets')" />
</Project>
+5 -25
View File
@@ -1,37 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Azure.Core" version="1.6.0" targetFramework="net462" />
<package id="Azure.Identity" version="1.3.0" targetFramework="net462" />
<package id="EntityFramework" version="6.4.4" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.0.0" targetFramework="net462" />
<package id="Microsoft.Data.SqlClient" version="4.1.1" targetFramework="net462" />
<package id="Microsoft.Data.SqlClient.SNI" version="4.0.1" targetFramework="net462" />
<package id="Microsoft.Identity.Client" version="4.22.0" targetFramework="net462" />
<package id="Microsoft.Identity.Client.Extensions.Msal" version="2.16.5" targetFramework="net462" />
<package id="Microsoft.IdentityModel.JsonWebTokens" version="6.8.0" targetFramework="net462" />
<package id="Microsoft.IdentityModel.Logging" version="6.8.0" targetFramework="net462" />
<package id="Microsoft.IdentityModel.Protocols" version="6.8.0" targetFramework="net462" />
<package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.8.0" targetFramework="net462" />
<package id="Microsoft.IdentityModel.Tokens" version="6.8.0" targetFramework="net462" />
<package id="NLog" version="4.7.9" targetFramework="net462" />
<package id="NLog" version="5.2.3" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Configuration.ConfigurationManager" version="5.0.0" targetFramework="net462" />
<package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net462" />
<package id="System.IdentityModel.Tokens.Jwt" version="6.8.0" targetFramework="net462" />
<package id="System.IO" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.1.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.5" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net462" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
<package id="System.Security.AccessControl" version="5.0.0" targetFramework="net462" />
<package id="System.Security.AccessControl" version="6.0.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.ProtectedData" version="4.5.0" targetFramework="net462" />
<package id="System.Security.Permissions" version="5.0.0" targetFramework="net462" />
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
<package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net462" />
<package id="System.Text.Json" version="4.6.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
</packages>
+1 -1
View File
@@ -12,7 +12,7 @@
<copyright>#copyright#</copyright>
<tags>EgwProxy.Icoel EgwProxy Icoel</tags>
<dependencies>
<dependency id="NLog" version="4.7.9" />
<dependency id="NLog" version="5.1.2" />
<dependency id="EntityFramework" version="6.4.4" />
</dependencies>
</metadata>
+1 -1
View File
@@ -12,7 +12,7 @@
<copyright>#copyright#</copyright>
<tags>EgwProxy.Icoel EgwProxy Icoel</tags>
<dependencies>
<dependency id="NLog" version="4.7.9" />
<dependency id="NLog" version="5.1.2" />
<dependency id="EntityFramework" version="6.4.4" />
</dependencies>
</metadata>
-26
View File
@@ -47,31 +47,5 @@
</connectionStrings>
-->
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
@@ -36,8 +36,8 @@
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll</HintPath>
<Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
+1 -1
View File
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.IO.Compression" version="4.1.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
</packages>
-26
View File
@@ -33,31 +33,5 @@
<add name="EntrataFrontiera" connectionString="data source=192.168.137.10\sqlexpress;initial catalog=frontiera;persist security info=True;user id=egalware;password=egalware2022;MultipleActiveResultSets=True;App=EntityFramework" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.1" newVersion="4.0.5.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
+5 -4
View File
@@ -39,15 +39,16 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.9\lib\net45\NLog.dll</HintPath>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.2.3\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.1.0\lib\net46\System.IO.Compression.dll</HintPath>
<Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
+2 -2
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="4.7.9" targetFramework="net462" />
<package id="System.IO.Compression" version="4.1.0" targetFramework="net462" />
<package id="NLog" version="5.2.3" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
</packages>
Binary file not shown.
@@ -1,4 +1,3 @@
ALTER PROCEDURE [dbo].[GetMachineFluxLog]
AS
BEGIN
@@ -26,7 +25,7 @@ BEGIN
IF(@NewIdx > @LastIdx)
BEGIN
/* --------------------------------------------------
* Inviero solo VARIAZIONI dei valori
* Invierò solo VARIAZIONI dei valori
* - CurrentPP (Part Program)
* - ActiveProdOrder (Ordine in esecuzione)
*
@@ -1,4 +1,4 @@
ALTER PROCEDURE [dbo].GetMachineProdData
ALTER PROCEDURE [dbo].[stp_GetMachineProdData]
AS
BEGIN
-- SET NOCOUNT ON added to prevent extra result sets from
@@ -24,9 +24,10 @@ BEGIN
IF(@NewIdx > @LastIdx)
BEGIN
/* --------------------------------------------------
* Invierò solo VARIAZIONI dei valori
* Invierò solo VARIAZIONI dei valori
* - CurrentProdOrder (iniziato/concluso)
* - Quantità Produzione
* - Quantità Produzione
* - dati FluxLog x ordini/quantità/tempi di produzione
*
* andando ad incrociare ogni record col precedente...
* -------------------------------------------------- */
@@ -86,7 +87,66 @@ BEGIN
FROM cteActDec
WHERE OrdAction <> 'NONE'
-- ora processo ANCHE come fluxLog i record dei degli ordini (cod ordine, tempi...)
;WITH cteCurrOrd AS
(
SELECT ID
,ProdOrder
,Targa as IdxMacchina
,[DateTime] AS DtEvento
,ProdOrderState
,ProdQty
,ElapsedTime
FROM syn_M2ERP_PRODORDERS
WHERE ID > @LastIdx AND ID <= @NewIdx
)
, ctePrevOrd AS
(
SELECT ID
,ProdOrder
,Targa as IdxMacchina
,[DateTime] AS DtEvento
,ProdOrderState
,ProdQty
,ElapsedTime
FROM syn_M2ERP_PRODORDERS
WHERE ID >= @LastIdx AND ID < @NewIdx
)
, cteActDec AS
(
SELECT curr.DtEvento as DtEve
,curr.IdxMacchina
,CASE
WHEN curr.ProdOrderState = 1 THEN 'StartOrd'
--WHEN curr.ProdOrderState = 2 THEN 'PauseOrd'
WHEN curr.ProdOrderState = 3 THEN 'EndOrd'
--WHEN curr.ProdOrderState = 6 THEN 'InsOrd'
ELSE 'NONE'
END AS OrdAction
,CAST(CASE
WHEN LEFT(curr.ProdOrder, 4) = 'PODL' THEN REPLACE(curr.ProdOrder,'PODL','')
ELSE '0' END AS NVARCHAR(50)) AS IdxPodl
,CAST(CASE
WHEN LEFT(curr.ProdOrder, 3) = 'ODL' THEN REPLACE(curr.ProdOrder,'ODL','')
ELSE '0' END AS NVARCHAR(50)) AS IdxOdl
,CAST(curr.ProdOrder AS NVARCHAR(50)) as CodComm
,curr.ProdQty as PzCount
,CAST(curr.ElapsedTime AS NVARCHAR(50)) AS ElapsedTime
FROM cteCurrOrd curr
INNER JOIN ctePrevOrd prev
ON curr.ID = prev.ID+1
WHERE (curr.ProdOrder <> prev.ProdOrder)
OR (curr.ProdOrderState <> prev.ProdOrderState)
OR (curr.ProdQty <> prev.ProdQty)
)
-- lego i valori col precedente x calcolare se siano variati x insert valori
--INSERT INTO MachineFluxLog(DtEvento, IdxMacchina, CodFlux, Valore, Cnt)
SELECT DtEve as DtEvento, IdxMacchina, CodFlux, Valore,0 as Cnt
FROM cteActDec
UNPIVOT (Valore FOR CodFlux IN (CodComm, ElapsedTime, IdxOdl, IdxPOdl)) AS Unpvt
WHERE OrdAction <> 'NONE'
AND Valore <> '0'
-- aggiorno valore indice processato
MERGE SyncState AS tgt
USING (SELECT @NewIdx as LastIdx, 'ToMachineProdData' AS TableName) as src (LastIdx, TableName)
@@ -104,6 +164,3 @@ BEGIN
COMMIT tran
END
GO
Binary file not shown.
@@ -4,6 +4,11 @@ select * from SyncState
select * from MesPODL_last
select * from MesPODL_req
select * from MachineFluxLog
select * from MachineProdData
select * from MachineSignalLog
-- test scrittura PODL: OK!
exec dbo.SyncPodlToMachine
@@ -12,24 +17,49 @@ select * from SyncState
select * from MachineSignalLog
/*
truncate table MachineSignalLog
truncate table MachineFluxLog
update SyncState
set lastidx=0
where TableName='syn_M2ERP_MACHINE_STATE'
where TableName='ToMachineFluxLog'
*/
select top 2 * from MachineFluxLog order by 1 desc
select top 2 * from MachineProdData order by 1 desc
select top 10 * from MachineSignalLog order by 1 desc
select * from SyncState
exec dbo.GetMachineFluxLog
select * from MachineFluxLog
select * from syn_ERP2M
select * from syn_M2ERP_MACHINE_STATE
select * from syn_M2ERP_PRODORDERS
select * from syn_ERP2M
select top 10 * from syn_M2ERP_PRODORDERS
where ProdOrder LIKE 'PODL000%'
select top 10 * from syn_M2ERP_PRODORDERS
where ProdOrder LIKE '%ODL%'
order by 1 desc
EXEC GetMachineProdData
SELECT * FROM SyncState
SELECT * FROM MachineFluxLog
SELECT * FROM MachineProdData
SELECT * FROM MachineSignalLog
/*
truncate table MachineProdData
update SyncState
set lastidx=0
where TableName='ToMachineProdData'
*/
select * from ActType
/*
@@ -64,3 +94,5 @@ select * from M2ERP_MACHINE_STATE where ActiveProdOrder = 'ODL0003743'
select * from M2ERP_PRODORDERS
select * from M2ERP_PRODORDERS where ProdOrder = 'ODL0003743'
@@ -0,0 +1,49 @@
-- =============================================
-- Author: S.E.L.
-- Create date: 2023.03.17
-- Description: Verifica ordini aperti - EXT schema/special
-- =============================================
CREATE PROCEDURE ext.stp_OrdState
(
@onlyOpen INT = 0 -- 1 = solo ordini rimasti aperti/validi
)
AS
BEGIN
-- SET NOCOUNT ON added to prevent extra result sets from
-- interfering with SELECT statements.
SET NOCOUNT ON;
IF (@onlyOpen = 0)
BEGIN
;WITH cteOrd AS
(
SELECT ProdOrder, MAX(id) as lastID
FROM syn_M2ERP_PRODORDERS
GROUP BY ProdOrder
)
SELECT m2erp.*
FROM syn_M2ERP_PRODORDERS m2erp
INNER JOIN cteord cte ON m2erp.ID=cte.lastID
ORDER BY 1 DESC
END
ELSE
BEGIN
;WITH cteOrd AS
(
SELECT ProdOrder, MAX(id) as lastID
FROM syn_M2ERP_PRODORDERS
GROUP BY ProdOrder
)
SELECT m2erp.*
FROM syn_M2ERP_PRODORDERS m2erp
INNER JOIN cteord cte ON m2erp.ID=cte.lastID
WHERE m2erp.ProdOrderState NOT IN (3,4)
ORDER BY 1 DESC
END
END
GO
+9 -1
View File
@@ -63,7 +63,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -99,6 +99,14 @@
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.4" newVersion="6.0.0.4" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
+48 -38
View File
@@ -38,38 +38,48 @@
<ApplicationIcon>IobManIcon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="DnsClient, Version=1.6.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.6.0\lib\net45\DnsClient.dll</HintPath>
<Reference Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
<HintPath>..\packages\AWSSDK.Core.3.7.100.14\lib\net45\AWSSDK.Core.dll</HintPath>
</Reference>
<Reference Include="AWSSDK.SecurityToken, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
<HintPath>..\packages\AWSSDK.SecurityToken.3.7.100.14\lib\net45\AWSSDK.SecurityToken.dll</HintPath>
</Reference>
<Reference Include="DnsClient, Version=1.6.1.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.6.1\lib\net45\DnsClient.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.14.2204.2616, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2204.2616\lib\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.14.2304.1209, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2304.1209\lib\MapoSDK.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.15.0\lib\netstandard2.0\MongoDB.Bson.dll</HintPath>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=6.0.0.4, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.6.0.4\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.15.0\lib\netstandard2.0\MongoDB.Driver.dll</HintPath>
<Reference Include="MongoDB.Bson, Version=2.21.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.21.0\lib\netstandard2.0\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver.Core, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.15.0\lib\netstandard2.0\MongoDB.Driver.Core.dll</HintPath>
<Reference Include="MongoDB.Driver, Version=2.21.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.21.0\lib\netstandard2.0\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Libmongocrypt, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.3.0\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
<Reference Include="MongoDB.Driver.Core, Version=2.21.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.21.0\lib\netstandard2.0\MongoDB.Driver.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Libmongocrypt, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.8.0\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.2.3\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
@@ -80,17 +90,20 @@
<Reference Include="SharpCompress, Version=0.31.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.31.0\lib\net461\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="Snappier, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a1b25124e6e13a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Snappier.1.0.0\lib\netstandard2.0\Snappier.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.5.61\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.6.122\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare.IO, Version=5.2.2205.1719, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.IO.5.2.2205.1719\lib\net462\SteamWare.IO.dll</HintPath>
<Reference Include="SteamWare.IO, Version=5.2.2206.1310, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.IO.5.2.2206.1310\lib\net462\SteamWare.IO.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.2.2205.1719, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.2.2205.1719\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.2.2206.1310, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.2.2206.1310\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Scheduler, Version=5.2.2205.1719, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Scheduler.5.2.2205.1719\lib\net462\SteamWare.Scheduler.dll</HintPath>
<Reference Include="SteamWare.Scheduler, Version=5.2.2206.1310, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Scheduler.5.2.2206.1310\lib\net462\SteamWare.Scheduler.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -101,7 +114,7 @@
<Reference Include="System.Diagnostics.PerformanceCounter, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
@@ -110,8 +123,8 @@
<Reference Include="System.IO.Pipelines, Version=6.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.6.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
@@ -175,6 +188,9 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="ZstdSharp, Version=0.6.2.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
<HintPath>..\packages\ZstdSharp.Port.0.6.2\lib\net461\ZstdSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\VersGen\VersGen.cs">
@@ -229,19 +245,12 @@
</None>
<None Include="CONF\license.json" />
<None Include="CONF\process.json" />
<None Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
<None Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
<None Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
<None Include="Core\Compression\Zstandard\lib\osx\libzstd.dylib" />
<None Include="logs\.placeholder">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<Content Include="NLog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@@ -266,6 +275,9 @@
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\AWSSDK.SecurityToken.3.7.100.14\analyzers\dotnet\cs\AWSSDK.SecurityToken.CodeAnalysis.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterBuild">
<ItemGroup>
@@ -273,13 +285,11 @@
</ItemGroup>
<Move SourceFiles="@(MoveToLibFolder)" DestinationFolder="$(OutputPath)lib" OverwriteReadOnlyFiles="true" />
</Target>
<Import Project="..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.8.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.8.0\build\MongoDB.Libmongocrypt.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.8.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.8.0\build\MongoDB.Libmongocrypt.targets'))" />
</Target>
<Import Project="..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets')" />
</Project>
-3656
View File
File diff suppressed because it is too large Load Diff
+19 -16
View File
@@ -1,31 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DnsClient" version="1.6.0" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2204.2616" targetFramework="net462" />
<package id="AWSSDK.Core" version="3.7.100.14" targetFramework="net462" />
<package id="AWSSDK.SecurityToken" version="3.7.100.14" targetFramework="net462" />
<package id="DnsClient" version="1.6.1" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2304.1209" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.3.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net462" />
<package id="NLog" version="4.7.15" targetFramework="net462" />
<package id="NLog.Config" version="4.7.12" targetFramework="net462" />
<package id="NLog.Schema" version="4.7.12" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.2" targetFramework="net462" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.4" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.21.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.21.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.21.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.8.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="NLog" version="5.2.3" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.8" targetFramework="net462" />
<package id="PrettyBin" version="1.1.0" targetFramework="net461" />
<package id="RestSharp" version="106.15.0" targetFramework="net462" />
<package id="RestSharp.Serializers.NewtonsoftJson" version="106.15.0" targetFramework="net462" />
<package id="SharpCompress" version="0.31.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.3.3" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.5.61" targetFramework="net462" />
<package id="SteamWare.IO" version="5.2.2205.1719" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.2.2205.1719" targetFramework="net462" />
<package id="SteamWare.Scheduler" version="5.2.2205.1719" targetFramework="net462" />
<package id="Snappier" version="1.0.0" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.6.122" targetFramework="net462" />
<package id="SteamWare.IO" version="5.2.2206.1310" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.2.2206.1310" targetFramework="net462" />
<package id="SteamWare.Scheduler" version="5.2.2206.1310" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="6.0.1" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="6.0.2" targetFramework="net462" />
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
<package id="System.Memory" version="4.5.5" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net462" />
@@ -38,4 +40,5 @@
<package id="System.Threading.Channels" version="6.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
<package id="ZstdSharp.Port" version="0.6.2" targetFramework="net462" />
</packages>
+28
View File
@@ -0,0 +1,28 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace IOB_UT_NEXT
{
public class BitUtils
{
/// <summary>
/// Test se il bit sia attivo
/// </summary>
/// <param name="val2check">valkore da verificare</param>
/// <param name="bitNum">bit da verificare (0 based, 00..31)</param>
/// <returns></returns>
public static bool isActive(int val2check, int bitNum)
{
bool answ = false;
// testa i-esimo bit (max 32 bit...)
if (bitNum <= 31)
{
answ = ((val2check & (1 << bitNum)) != 0);
}
return answ;
}
}
}
+1
View File
@@ -116,6 +116,7 @@ namespace IOB_UT_NEXT
public string Note { get; set; } = "";
public string CodCli { get; set; } = "";
public DateTime InsertDate { get; set; } = DateTime.Now;
public string Recipe { get; set; } = "";
public string CodFase
{
+54 -3
View File
@@ -14,8 +14,8 @@ namespace IOB_UT_NEXT
/// Effettua salvataggio in file di un generico oggetto in formato CSV
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="reportData"></param>
/// <param name="path"></param>
/// <param name="reportData">Lista oggetti da esportare</param>
/// <param name="path">Percorso file di output</param>
/// <param name="writeHeader">Indica se scrivere header ad inizio CSV</param>
/// <param name="separator">Separatore da impiegare (default ";")</param>
/// <returns></returns>
@@ -34,7 +34,6 @@ namespace IOB_UT_NEXT
lines.Add(header);
}
var valueLines = reportData.Select(row => string.Join($"{separator}", fieldList.Split(separator).Select(a => row.GetType().GetProperty(a).GetValue(row, null))));
//var valueLines = reportData.Select(row => string.Join(";", header.Split(';').Select(a => row.GetType().GetProperty(a).GetValue(row, null))));
lines.AddRange(valueLines);
File.WriteAllLines(path, lines.ToArray());
answ = true;
@@ -43,5 +42,57 @@ namespace IOB_UT_NEXT
{ }
return answ;
}
/// <summary>
/// Effettua salvataggio in file di un generico oggetto in formato Fixed width
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="reportData">Lista oggetti da esportare</param>
/// <param name="path">Percorso file di output</param>
/// <param name="widthList">Vettore delle larghezze richieste</param>
/// <returns></returns>
public static bool SaveFixedWidth<T>(List<T> reportData, string path, Dictionary<string, int> widthList, Dictionary<string, char> fieldLPad, Dictionary<string, int> numDecReq)
{
bool answ = false;
var lines = new List<string>();
try
{
IEnumerable<PropertyDescriptor> props = TypeDescriptor.GetProperties(typeof(T)).OfType<PropertyDescriptor>();
var elencoValori = props.ToList();
foreach (var dataRow in reportData)
{
string currRow = "";
// processo 1:1 x width...
foreach (var item in widthList)
{
string currValue = dataRow.GetType().GetProperty(item.Key).GetValue(dataRow, null).ToString();
// se ha un num decimali specifico richiesto esegue...
if (numDecReq.ContainsKey(item.Key))
{
string nDec = $"N{numDecReq[item.Key]}";
decimal rawVal = 0;
decimal.TryParse(currValue, out rawVal);
currValue = rawVal.ToString(nDec);
}
if (currValue.Length > item.Value)
{
currValue = currValue.Substring(0, item.Value);
}
// se ha un LPad richiesto esegue...
if (fieldLPad.ContainsKey(item.Key))
{
currValue = currValue.PadLeft(item.Value, fieldLPad[item.Key]);
}
currRow += string.Format($"{{0,-{item.Value}}}", currValue);
}
lines.Add(currRow);
}
File.WriteAllLines(path, lines.ToArray());
answ = true;
}
catch
{ }
return answ;
}
}
}
+348
View File
@@ -0,0 +1,348 @@
using System;
using System.Collections.Generic;
using System.Xml.Serialization;
namespace IOB_UT_NEXT.DataModel
{
public class Fimat
{
#region Public Classes
[XmlRoot(ElementName = "A_Recipe")]
public class ARecipe
{
#region Public Properties
[XmlElement(ElementName = "ColRecipe")]
public List<ColRecipe> ColRecipe { get; set; }
[XmlElement(ElementName = "DesRecipe")]
public DesRecipe DesRecipe { get; set; }
[XmlAttribute(AttributeName = "noNamespaceSchemaLocation")]
public string NoNamespaceSchemaLocation { get; set; }
[XmlText]
public string Text { get; set; }
[XmlAttribute(AttributeName = "xsi")]
public string Xsi { get; set; }
#endregion Public Properties
}
[XmlRoot(ElementName = "ColData")]
public class ColData
{
#region Public Properties
[XmlElement(ElementName = "ColourCode")]
public string ColourCode { get; set; }
[XmlElement(ElementName = "CompNumber")]
public int CompNumber { get; set; }
[XmlElement(ElementName = "Cost")]
public double Cost { get; set; }
[XmlElement(ElementName = "Date")]
public string Date { get; set; }
[XmlElement(ElementName = "Description")]
public string Description { get; set; }
[XmlElement(ElementName = "DosDuration")]
public int DosDuration { get; set; }
[XmlElement(ElementName = "DosError")]
public string DosError { get; set; }
[XmlElement(ElementName = "DosNote")]
public string DosNote { get; set; }
[XmlElement(ElementName = "Origin")]
public string Origin { get; set; }
[XmlElement(ElementName = "PartsPerc")]
public double PartsPerc { get; set; }
[XmlElement(ElementName = "PartsWeight")]
public double PartsWeight { get; set; }
[XmlElement(ElementName = "TypComp")]
public string TypComp { get; set; }
[XmlElement(ElementName = "Weight-gr")]
public double Weightgr { get; set; }
[XmlElement(ElementName = "Weight-gr-dosed")]
public double Weightgrdosed { get; set; }
[XmlElement(ElementName = "Weight-gr-prev")]
public double Weightgrprev { get; set; }
[XmlElement(ElementName = "Weight-gr-total")]
public double Weightgrtotal { get; set; }
#endregion Public Properties
}
[XmlRoot(ElementName = "ColRecipe")]
public class ColRecipe
{
#region Public Properties
[XmlElement(ElementName = "ColData")]
public ColData ColData { get; set; }
#endregion Public Properties
}
/// <summary>
/// Record consumo componente x rendiconto settimanale
/// </summary>
public class ConsRec
{
#region Public Properties
public string FileRef { get; set; } = "";
public string ColourCode { get; set; } = "";
public string Description { get; set; } = "";
public DateTime DtRif { get; set; } = DateTime.Now;
public double WeightGrTot { get; set; } = 0;
#endregion Public Properties
}
/// <summary>
/// Record consumo componente x rendiconto settimanale
/// </summary>
public class ConsOut
{
#region Public Properties
public string CodMag { get; set; } = "";
public string ColourCode { get; set; } = "";
public string Description { get; set; } = "";
public string UM { get; set; } = "";
public double WeightKgProc { get; set; } = 0;
public DateTime DtRif { get; set; } = DateTime.Now;
//public string FileRef { get; set; } = "";
#endregion Public Properties
}
/// <summary>
/// Record info sul periodo indicato
/// </summary>
public class PeriodInfo
{
#region Public Properties
public int NumFilesReceived { get; set; } = 0;
public string CurrStatus { get; set; } = "";
public Dictionary<string, string> ActionList { get; set; } = new Dictionary<string, string>();
#endregion Public Properties
}
/// <summary>
/// Configurazione x conversioni dati
/// </summary>
public class ConvSetup
{
/// <summary>
/// Inclusione o meno dell'header in file CSV
/// </summary>
public bool addHeader { get; set; } = false;
/// <summary>
/// Numero cifre decimale x arrotondamento
/// </summary>
public int numDec { get; set; } = 3;
/// <summary>
/// CodMagazzino
/// </summary>
public string codMag { get; set; } = "";
/// <summary>
/// Modalità export:
/// csv / FixWidth
/// </summary>
public string mode { get; set; } = "";
/// <summary>
/// Rapporti di conversione x gli item indicati
/// </summary>
public Dictionary<string, double> convRatio { get; set; } = new Dictionary<string, double>();
/// <summary>
/// Lunghezza fissa campi
/// </summary>
public Dictionary<string, int> fieldLength { get; set; } = new Dictionary<string, int>();
/// <summary>
/// Numero decimali campo
/// </summary>
public Dictionary<string, int> fieldNDec { get; set; } = new Dictionary<string, int>();
/// <summary>
/// Padding left (OVE necessari)
/// </summary>
public Dictionary<string, char> fieldLPad { get; set; } = new Dictionary<string, char>();
}
[XmlRoot(ElementName = "DesData")]
public class DesData
{
#region Public Properties
[XmlElement(ElementName = "Article")]
public string Article { get; set; }
[XmlElement(ElementName = "CustDrumCode")]
public string CustDrumCode { get; set; }
[XmlElement(ElementName = "Customer")]
public string Customer { get; set; }
[XmlElement(ElementName = "Date")]
public string Date { get; set; }
[XmlElement(ElementName = "Design")]
public string Design { get; set; }
[XmlElement(ElementName = "DosDuration")]
public int DosDuration { get; set; }
[XmlElement(ElementName = "DosedLine")]
public int DosedLine { get; set; }
[XmlElement(ElementName = "DosType")]
public string DosType { get; set; }
[XmlElement(ElementName = "DrumCode")]
public string DrumCode { get; set; }
[XmlElement(ElementName = "DrumInitialWeightKG")]
public double DrumInitialWeightKG { get; set; }
[XmlElement(ElementName = "DrumTag")]
public int DrumTag { get; set; }
[XmlElement(ElementName = "DrumType")]
public int DrumType { get; set; }
[XmlElement(ElementName = "Info1")]
public string Info1 { get; set; }
[XmlElement(ElementName = "Info2")]
public string Info2 { get; set; }
[XmlElement(ElementName = "Info3")]
public string Info3 { get; set; }
[XmlElement(ElementName = "Info4")]
public string Info4 { get; set; }
[XmlElement(ElementName = "Info5")]
public string Info5 { get; set; }
[XmlElement(ElementName = "Info6")]
public string Info6 { get; set; }
[XmlElement(ElementName = "Info7")]
public string Info7 { get; set; }
[XmlElement(ElementName = "Info8")]
public string Info8 { get; set; }
[XmlElement(ElementName = "Info9")]
public string Info9 { get; set; }
[XmlElement(ElementName = "LotID")]
public string LotID { get; set; }
[XmlElement(ElementName = "Note1")]
public string Note1 { get; set; }
[XmlElement(ElementName = "Note2")]
public string Note2 { get; set; }
[XmlElement(ElementName = "OrderCode")]
public string OrderCode { get; set; }
[XmlElement(ElementName = "Prio")]
public string Prio { get; set; }
[XmlElement(ElementName = "Quantity-kg")]
public double Quantitykg { get; set; }
[XmlElement(ElementName = "Quantity-kg-dosed")]
public double Quantitykgdosed { get; set; }
[XmlElement(ElementName = "RecipeStatus")]
public string RecipeStatus { get; set; }
[XmlElement(ElementName = "RecipeType")]
public string RecipeType { get; set; }
[XmlElement(ElementName = "RecName")]
public string RecName { get; set; }
[XmlElement(ElementName = "ReqType")]
public string ReqType { get; set; }
[XmlElement(ElementName = "Screen")]
public string Screen { get; set; }
[XmlElement(ElementName = "Sequence")]
public int Sequence { get; set; }
[XmlElement(ElementName = "SequenceTot")]
public int SequenceTot { get; set; }
[XmlElement(ElementName = "Series")]
public int Series { get; set; }
[XmlElement(ElementName = "ServiceType")]
public string ServiceType { get; set; }
[XmlElement(ElementName = "SplitCurrent")]
public int SplitCurrent { get; set; }
[XmlElement(ElementName = "SplitTotal")]
public int SplitTotal { get; set; }
[XmlElement(ElementName = "Taglio-D")]
public double TaglioD { get; set; }
[XmlElement(ElementName = "Taglio-N")]
public double TaglioN { get; set; }
[XmlElement(ElementName = "UM")]
public int UM { get; set; }
[XmlElement(ElementName = "Variant")]
public string Variant { get; set; }
[XmlElement(ElementName = "ViscoName")]
public string ViscoName { get; set; }
[XmlElement(ElementName = "ViscoValue")]
public double ViscoValue { get; set; }
#endregion Public Properties
}
[XmlRoot(ElementName = "DesRecipe")]
public class DesRecipe
{
#region Public Properties
[XmlElement(ElementName = "DesData")]
public DesData DesData { get; set; }
#endregion Public Properties
}
#endregion Public Classes
}
}
+129
View File
@@ -0,0 +1,129 @@
using StackExchange.Redis;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
namespace IOB_UT_NEXT
{
/// <summary>
/// Classe gestione code, a seconda della conf come LIST redis o come concurrent queue in memoria
/// </summary>
public class DataQueue
{
#region Public Fields
public int Count = 0;
#endregion Public Fields
#region Public Constructors
public DataQueue(string codIOB, string qName, bool useRedis)
{
UseRedis = useRedis;
CodIOB = codIOB;
QueueName = qName;
KeyName = redisMan.redHash($"IOB:QUEUE:{CodIOB}:{QueueName}");
}
#endregion Public Constructors
#region Public Methods
/// <summary>
/// Accodamento elemento
/// </summary>
/// <param name="item"></param>
public void Enqueue(string item)
{
if (UseRedis)
{
redisMan.redQueuePush(KeyName, item);
Count = (int)redisMan.redQueueCount(KeyName);
}
else
{
MemQueue.Enqueue(item);
Count = MemQueue.Count;
}
}
/// <summary>
/// Lista string degli elementi in coda, svuotando la coda
/// </summary>
/// <returns></returns>
public List<string> ToList()
{
List<string> answ = new List<string>();
if (UseRedis)
{
Count = (int)redisMan.redQueueCount(KeyName);
// ciclo x prendere tutti...
while (Count > 0)
{
answ.Add(redisMan.redQueuePop(KeyName));
Count = (int)redisMan.redQueueCount(KeyName);
}
}
else
{
answ = MemQueue.ToList();
Count = MemQueue.Count;
}
return answ;
}
/// <summary>
/// Recupera 1 record dalla coda...
/// </summary>
/// <param name="result"></param>
/// <returns></returns>
public bool TryDequeue(out string result)
{
bool fatto = false;
if (UseRedis)
{
result = redisMan.redQueuePop(KeyName);
Count = (int)redisMan.redQueueCount(KeyName);
fatto = true;
}
else
{
fatto = MemQueue.TryDequeue(out result);
Count = MemQueue.Count;
}
return fatto;
}
#endregion Public Methods
#region Private Fields
private string CodIOB = "NA";
private RedisKey KeyName = "NA";
/// <summary>
/// Coda modalità memoria locale
/// </summary>
private ConcurrentQueue<string> MemQueue = new ConcurrentQueue<string>();
private string QueueName = "NA";
/// <summary>
/// Indica se usare redis come datastore vs memoria
/// </summary>
private bool UseRedis = false;
#endregion Private Fields
#region Private Properties
/// <summary>
/// Oggetto connessione REDIS
/// </summary>
private RedisIobCache redisMan { get; set; } = new RedisIobCache();
#endregion Private Properties
}
}
+5
View File
@@ -312,6 +312,11 @@ namespace IOB_UT_NEXT
///// </summary>
//FILE_XYLOG,
/// <summary>
/// File Based Log file analisys per Soitaab
/// </summary>
FILE_SOITAAB,
/// <summary>
/// Adapter KAWASAKI e-controller
/// </summary>
+20 -14
View File
@@ -74,12 +74,15 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.1.9, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.1\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="MapoSDK, Version=6.14.2211.3016, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2211.3016\lib\MapoSDK.dll</HintPath>
<Reference Include="MapoSDK, Version=6.14.2304.1209, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MapoSDK.6.14.2304.1209\lib\MapoSDK.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -88,13 +91,13 @@
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.1.2\lib\net46\NLog.dll</HintPath>
<HintPath>..\packages\NLog.5.2.3\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.6.80\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.6.122\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -102,17 +105,17 @@
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.PerformanceCounter, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.6.0.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
<Reference Include="System.Diagnostics.PerformanceCounter, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
</Reference>
<Reference Include="System.IO.Pipelines, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.6.0.0\lib\net461\System.IO.Pipelines.dll</HintPath>
<Reference Include="System.IO.Pipelines, Version=6.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.6.0.3\lib\net461\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Numerics" />
@@ -141,6 +144,9 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BitUtils.cs" />
<Compile Include="DataModel\Fimat.cs" />
<Compile Include="DataQueue.cs" />
<Compile Include="FileProcMan.cs" />
<Compile Include="IntConditionCheck.cs" />
<Compile Include="BitConditionCheck.cs" />
+9
View File
@@ -816,4 +816,13 @@ namespace IOB_UT_NEXT
#endregion Public Properties
}
/// <summary>
/// Generico evento log
/// </summary>
public class GenLogRow
{
public DateTime dtRif { get; set; } = DateTime.Now;
public string valString { get; set; } = "";
}
}
+86 -1
View File
@@ -729,6 +729,60 @@ namespace IOB_UT_NEXT
return answ;
}
/// <summary>
/// Conteggio elementi in QUEUE (FIFO)
/// </summary>
/// <param name="queueName"></param>
/// <param name="value"></param>
public long redQueueCount(RedisKey queueName)
{
return cache.ListLength(queueName);
}
/// <summary>
/// Recupero valore in QUEUE (FIFO)
/// </summary>
/// <param name="queueName"></param>
/// <param name="value"></param>
public RedisValue redQueuePop(RedisKey queueName)
{
return cache.ListLeftPop(queueName);
}
/// <summary>
/// Scrittura valore in QUEUE (FIFO)
/// </summary>
/// <param name="queueName"></param>
/// <param name="value"></param>
public void redQueuePush(RedisKey queueName, RedisValue value)
{
cache.ListRightPush(queueName, value);
}
/// <summary>
/// RIMUOVE un singolo valore (riga) dalla hash
/// </summary>
/// <param name="hashKey"></param>
/// <param name="hashField"></param>
/// <returns></returns>
public string redRemoveHashField(string hashKey, string hashField)
{
string answ = "";
// cerco se ci sia valore in redis...
try
{
RedisKey chiave = hashKey;
RedisValue campo = hashField;
RedisValue valOut = cache.HashDelete(chiave, campo);
answ = valOut.ToString();
}
catch (Exception exc)
{
Logging.Instance.Error($"redRemoveHashField{Environment.NewLine}{exc}");
}
return answ;
}
/// <summary>
/// Salvataggio di una hash di valori
/// </summary>
@@ -907,6 +961,36 @@ namespace IOB_UT_NEXT
return answ;
}
/// <summary>
/// Conteggio elementi in QUEUE (LIFO)
/// </summary>
/// <param name="queueName"></param>
/// <param name="value"></param>
public long redStackCount(RedisKey queueName)
{
return cache.ListLength(queueName);
}
/// <summary>
/// Recupero valore in STACK (LIFO)
/// </summary>
/// <param name="stackName"></param>
/// <returns></returns>
public RedisValue redStackPop(RedisKey stackName)
{
return cache.ListRightPop(stackName);
}
/// <summary>
/// Scrittura valore in STACK (LIFO)
/// </summary>
/// <param name="stackName"></param>
/// <param name="value"></param>
public void redStackPush(RedisKey stackName, RedisValue value)
{
cache.ListRightPush(stackName, value);
}
/// <summary>
/// Resetta (elimina) un contatore in Redis
/// </summary>
@@ -957,7 +1041,8 @@ namespace IOB_UT_NEXT
}
// invio notifica tramite il canale richiesto
messageDisp.Publish(notifyChannel, message);
RedisChannel pubNotifyChannel = new RedisChannel(notifyChannel, RedisChannel.PatternMode.Literal);
messageDisp.Publish(pubNotifyChannel, message);
fatto = true;
// restituisco!
return fatto;
+20 -16
View File
@@ -3,29 +3,17 @@
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.3" newVersion="6.0.0.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
@@ -34,6 +22,22 @@
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
+61 -25
View File
@@ -8,6 +8,7 @@ using System.IO;
using System.Linq;
using System.Net;
using System.Net.NetworkInformation;
using System.Security.Cryptography;
using System.Threading.Tasks;
namespace IOB_UT_NEXT
@@ -21,6 +22,11 @@ namespace IOB_UT_NEXT
/// </summary>
public static DateTime dtVetoPing = DateTime.Now;
/// <summary>
/// Indicazione VETO accodamento INGRESSI/EVENTI sino alla data-ora indicata
/// </summary>
public static DateTime dtVetoQueueIN = DateTime.Now;
/// <summary>
/// Indicazione VETO invio a server sino alla data-ora indicata
/// </summary>
@@ -66,27 +72,6 @@ namespace IOB_UT_NEXT
#region Public Methods
/// <summary>
/// Restituisce la prima cifra (a sx) da un numero (es x decodere quale memoria modbus sia)
/// </summary>
/// <param name="num">Numero di cui trovare la priam cifra</param>
/// <returns></returns>
public static int getFirstInt(int num)
{
if (num >= 100000000) num /= 100000000;
if (num >= 10000) num /= 10000;
if (num >= 100) num /= 100;
if (num >= 10) num /= 10;
#if false
// formulazione alternativa con ciclo...
while (num >= 10)
num /= 10;
#endif
return num;
}
/// <summary>
/// formatta un numero in forma binaria 0/1
/// </summary>
@@ -271,6 +256,20 @@ namespace IOB_UT_NEXT
return answ;
}
/// <summary>
/// Test esistenza/creazione directory
/// </summary>
/// <param name="dirPath"></param>
public static void checkDir(string dirPath)
{
if (!Directory.Exists(dirPath))
{
lg.Info($"Dir not found: {dirPath}");
Directory.CreateDirectory(dirPath);
lg.Info($"reated local dir {dirPath}");
}
}
/// <summary>
/// Conteggio valori true in un array di boolean
/// </summary>
@@ -349,6 +348,46 @@ namespace IOB_UT_NEXT
return answ;
}
/// <summary>
/// Calcolo MD5 del fine indicato
/// </summary>
/// <param name="fileName"></param>
/// <returns></returns>
public static string GetFileMd5(string fileName)
{
string answ = "";
using (var md5 = MD5.Create())
{
using (var stream = File.OpenRead(fileName))
{
var hash = md5.ComputeHash(stream);
answ = BitConverter.ToString(hash).Replace("-", "").ToLowerInvariant();
}
}
return answ;
}
/// <summary>
/// Restituisce la prima cifra (a sx) da un numero (es x decodere quale memoria modbus sia)
/// </summary>
/// <param name="num">Numero di cui trovare la priam cifra</param>
/// <returns></returns>
public static int getFirstInt(int num)
{
if (num >= 100000000) num /= 100000000;
if (num >= 10000) num /= 10000;
if (num >= 100) num /= 100;
if (num >= 10) num /= 10;
#if false
// formulazione alternativa con ciclo...
while (num >= 10)
num /= 10;
#endif
return num;
}
/// <summary>
/// IP della macchina
/// </summary>
@@ -720,10 +759,7 @@ namespace IOB_UT_NEXT
{
string dirPath = file.Substring(0, file.LastIndexOf('\\'));
// verifico directory
if (!Directory.Exists(dirPath))
{
Directory.CreateDirectory(dirPath);
}
checkDir(dirPath);
string[] lines = dictionary.OrderBy(i => i.Key).Select(kvp => kvp.Key + ":" + kvp.Value).ToArray();
try
{
+46 -11
View File
@@ -240,10 +240,7 @@ namespace IOB_UT_NEXT
else if (theEntry.IsDirectory)
{
string strNewDirectory = @"" + baseDirectory + @"\" + theEntry.Name;
if (!Directory.Exists(strNewDirectory))
{
Directory.CreateDirectory(strNewDirectory);
}
baseUtils.checkDir(strNewDirectory);
}
}
ZipStream.Close();
@@ -309,13 +306,8 @@ namespace IOB_UT_NEXT
}
else if (theEntry.IsDirectory)
{
string strNewDirectory = @"" + baseDirectory + @"\" +
theEntry.Name;
if (!Directory.Exists(strNewDirectory))
{
Directory.CreateDirectory(strNewDirectory);
}
string strNewDirectory = @"" + baseDirectory + @"\" + theEntry.Name;
baseUtils.checkDir(strNewDirectory);
}
}
ZipStream.Close();
@@ -911,6 +903,49 @@ namespace IOB_UT_NEXT
return fatto;
}
/// <summary>
/// Compressione zip x folder indicata
/// </summary>
/// <returns></returns>
public static bool zippaDirectory(string dirPath, string nomeZip)
{
bool fatto = false;
try
{
using (ZipOutputStream s = new ZipOutputStream(File.Create(nomeZip)))
{
s.SetLevel(5);
byte[] buffer = new byte[4096];
// processo x ogni file nella directory...
var file2zip = Directory.GetFiles(dirPath);
foreach (var currFile in file2zip)
{
ZipEntry entry = new ZipEntry(Path.GetFileName(currFile));
// Could also use the last write time or similar for the file.
entry.DateTime = DateTime.Now;
s.PutNextEntry(entry);
using (FileStream fs = File.OpenRead(currFile))
{
// Using a fixed size buffer here makes no noticeable difference for output
// but keeps a lid on memory usage.
int sourceBytes;
do
{
sourceBytes = fs.Read(buffer, 0, buffer.Length);
s.Write(buffer, 0, sourceBytes);
} while (sourceBytes > 0);
}
}
s.Finish();
s.Close();
}
fatto = true;
}
catch
{ }
return fatto;
}
#endregion Public Methods
#region Protected Fields
+8 -8
View File
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MapoSDK" version="6.14.2211.3016" targetFramework="net462" />
<package id="MapoSDK" version="6.14.2304.1209" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="NLog" version="5.1.2" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.2" targetFramework="net462" />
<package id="SharpZipLib" version="1.3.1" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.6.80" targetFramework="net462" />
<package id="NLog" version="5.2.3" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.8" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.6.122" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="6.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="6.0.1" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="6.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.4" targetFramework="net462" />
<package id="System.IO.Pipelines" version="6.0.3" targetFramework="net462" />
<package id="System.Memory" version="4.5.5" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net462" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
+10 -1
View File
@@ -9,9 +9,18 @@ namespace IOB_UT_NEXT
{
public class plcMemMapExt : plcMemMap
{
/// <summary>
/// Dizionario parametri opzionali
/// </summary>
public Dictionary<string, string> optMemPar { get; set; } = new Dictionary<string, string>();
/// <summary>
/// Dizionario x decodifica file
/// </summary>
public Dictionary<string, int> fileDecod { get; set; } = new Dictionary<string, int>();
/// <summary>
/// Lista ulteriori configurazioni KeyValuePair
/// </summary>
public Dictionary<string, string> optKVP { get; set; } = new Dictionary<string, string>();
}
}
-14
View File
@@ -1,19 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
+21 -21
View File
@@ -51,6 +51,8 @@
this.tabMes = new System.Windows.Forms.TabPage();
this.btnForceAutoOdl = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
this.label25 = new System.Windows.Forms.Label();
this.lblQueueRwTrLog = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.lblQueueULog = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
@@ -109,8 +111,6 @@
this.lblOutMessage3 = new System.Windows.Forms.Label();
this.lblOutMessage2 = new System.Windows.Forms.Label();
this.tabData = new System.Windows.Forms.TabControl();
this.label25 = new System.Windows.Forms.Label();
this.lblQueueRwTrLog = new System.Windows.Forms.Label();
this.statusStrip1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.tabMes.SuspendLayout();
@@ -391,6 +391,25 @@
this.panel1.Size = new System.Drawing.Size(343, 306);
this.panel1.TabIndex = 88;
//
// label25
//
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(10, 213);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(85, 13);
this.label25.TabIndex = 96;
this.label25.Text = "RwTr Queue len";
//
// lblQueueRwTrLog
//
this.lblQueueRwTrLog.AutoSize = true;
this.lblQueueRwTrLog.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblQueueRwTrLog.Location = new System.Drawing.Point(104, 213);
this.lblQueueRwTrLog.Name = "lblQueueRwTrLog";
this.lblQueueRwTrLog.Size = new System.Drawing.Size(31, 13);
this.lblQueueRwTrLog.TabIndex = 97;
this.lblQueueRwTrLog.Text = "###";
//
// label24
//
this.label24.AutoSize = true;
@@ -1047,25 +1066,6 @@
this.tabData.TabIndex = 71;
this.tabData.Selected += new System.Windows.Forms.TabControlEventHandler(this.TabData_Selected);
//
// label25
//
this.label25.AutoSize = true;
this.label25.Location = new System.Drawing.Point(10, 213);
this.label25.Name = "label25";
this.label25.Size = new System.Drawing.Size(85, 13);
this.label25.TabIndex = 96;
this.label25.Text = "RwTr Queue len";
//
// lblQueueRwTrLog
//
this.lblQueueRwTrLog.AutoSize = true;
this.lblQueueRwTrLog.Font = new System.Drawing.Font("Microsoft Sans Serif", 8F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.lblQueueRwTrLog.Location = new System.Drawing.Point(104, 213);
this.lblQueueRwTrLog.Name = "lblQueueRwTrLog";
this.lblQueueRwTrLog.Size = new System.Drawing.Size(31, 13);
this.lblQueueRwTrLog.TabIndex = 97;
this.lblQueueRwTrLog.Text = "###";
//
// AdapterForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+250 -242
View File
@@ -41,7 +41,7 @@ namespace IOB_WIN_NEXT
/// <summary>
/// Oggetto x gestione dell'adapter GENERICO (x poter usare metodi di ognuno...)
/// </summary>
public IobGeneric iobObj;
public Iob.Generic iobObj;
/// <summary>
/// tipo di adapter prescelto...
@@ -50,6 +50,89 @@ namespace IOB_WIN_NEXT
#endregion Public Fields
#region Protected Fields
/// <summary>
/// contatore veloce
/// </summary>
protected int fastCount;
/// <summary>
/// Data-Ora prima apertura FORM...
/// </summary>
protected DateTime firstStart;
/// <summary>
/// Oggetto ultimo inviato stato IOB x REDIS
/// </summary>
protected IobWinStatus lastIobStatus = new IobWinStatus() { lastUpdate = DateTime.Now.AddHours(-1), lastDataOut = DateTime.Now.AddHours(-1) };
/// <summary>
/// Oggetto ultimo inviato stato MP-IO x REDIS
/// </summary>
protected ServerMpStatus lastSrvStatus = new ServerMpStatus();
/// <summary>
/// ultimo tentativo riavvio...
/// </summary>
protected DateTime lastStartTry;
/// <summary>
/// contatore normale
/// </summary>
protected int normCount;
/// <summary>
/// Oggetto connessioen REDIS
/// </summary>
protected RedisIobCache redisMan = new RedisIobCache();
/// <summary>
/// Generatore numeri random
/// </summary>
protected Random rndGen = new Random();
/// <summary>
/// Contatore campionamento memoria
/// </summary>
protected int sampleMemCount;
/// <summary>
/// Indica se inviare avvio adapter con FluxLog
/// </summary>
protected bool sendStartFLog = false;
/// <summary>
/// contatore lento
/// </summary>
protected int slowCount;
/// <summary>
/// contatore sync allarmi
/// </summary>
protected int verySlowCount;
/// <summary>
/// Temnpo attesa std in MS
/// </summary>
protected int waitRecMSec = 30000;
#endregion Protected Fields
#region Private Fields
/// <summary>
/// Dizionario dei valori bloccati x evitare log eccessivo
/// </summary>
private Dictionary<string, DateTime> vetoLogError = new Dictionary<string, DateTime>();
/// <summary>
/// Periodo di veto log in minuti
/// </summary>
private int vetoPeriodMin = 15;
#endregion Private Fields
#region Public Constructors
/// <summary>
@@ -149,7 +232,7 @@ namespace IOB_WIN_NEXT
if (needSend)
{
// segnalo reboot (programma)...
IobGeneric.callUrl(iobObj.urlReboot, true);
Iob.Generic.callUrl(iobObj.urlReboot, true);
}
}
else
@@ -167,6 +250,12 @@ namespace IOB_WIN_NEXT
#endregion Public Constructors
#region Private Delegates
private delegate void SafeCallDelegate(string text);
#endregion Private Delegates
#region Public Properties
public int alQueueLen
@@ -671,6 +760,99 @@ namespace IOB_WIN_NEXT
#endregion Public Properties
#region Protected Properties
/// <summary>
/// Valore protected comunicazione PLC
/// </summary>
protected bool _commPlcActive { get; set; } = false;
/// <summary>
/// Valore protetto stato comunicazione
/// </summary>
protected int _commSrvActive { get; set; } = 0;
/// <summary>
/// Valore protected semaforo IN
/// </summary>
protected Semaforo _sIN { get; set; } = Semaforo.ND;
/// <summary>
/// Valore protected semaforo OUT
/// </summary>
protected Semaforo _sOUT { get; set; } = Semaforo.ND;
/// <summary>
/// Codice IOB della macchina cui connettersi (x scegliere corretto file di conf...)
/// </summary>
protected string CurrIOB { get; set; }
protected int delayShowLogMs { get; set; } = utils.CRI("delayShowLogMs");
/// <summary>
/// Dictionary dei divieti del datamonitor
/// </summary>
protected Dictionary<int, DateTime> dMonDisplVetoVeto { get; set; } = new Dictionary<int, DateTime>();
/// <summary>
/// array degli oggetti datamonitor da mostrare
/// </summary>
protected Dictionary<int, List<string>> dMonValues { get; set; } = new Dictionary<int, List<string>>();
/// <summary>
/// Veto a NUOVE scritture in COUNTER...
/// </summary>
protected DateTime logCounterVeto { get; set; } = DateTime.Now;
/// <summary>
/// Lista String da mostrare quale TaskLog corrente...
/// </summary>
protected List<string> logTaskString { get; set; } = new List<string>();
/// <summary>
/// Lista String da mostrare quale WatchLog corrente...
/// </summary>
protected ConcurrentQueue<string> logWatchString { get; set; } = new ConcurrentQueue<string>();
/// <summary>
/// Veto a NUOVE scritture in logWatch...
/// </summary>
protected DateTime logWatchWriteVeto { get; set; } = DateTime.Now;
protected int maxAlQueue { get; set; }
protected int maxEvQueue { get; set; }
protected int maxFlQueue { get; set; }
protected int maxMsQueue { get; set; }
protected int maxRwTrQueue { get; set; }
protected int maxUlQueue { get; set; }
protected int qAlLen { get; set; }
protected int qEvLen { get; set; }
protected int qFlLen { get; set; }
protected int qMsLen { get; set; }
protected int qRTrLen { get; set; }
protected int qUlLen { get; set; }
protected int totQueue
{
get
{
return qEvLen + qFlLen + qAlLen + qMsLen + qUlLen;
}
}
#endregion Protected Properties
#region Public Methods
/// <summary>
@@ -913,168 +1095,6 @@ namespace IOB_WIN_NEXT
#endregion Public Methods
#region Protected Fields
/// <summary>
/// contatore veloce
/// </summary>
protected int fastCount;
/// <summary>
/// Data-Ora prima apertura FORM...
/// </summary>
protected DateTime firstStart;
/// <summary>
/// Oggetto ultimo inviato stato IOB x REDIS
/// </summary>
protected IobWinStatus lastIobStatus = new IobWinStatus() { lastUpdate = DateTime.Now.AddHours(-1), lastDataOut = DateTime.Now.AddHours(-1) };
/// <summary>
/// Oggetto ultimo inviato stato MP-IO x REDIS
/// </summary>
protected ServerMpStatus lastSrvStatus = new ServerMpStatus();
/// <summary>
/// ultimo tentativo riavvio...
/// </summary>
protected DateTime lastStartTry;
/// <summary>
/// contatore normale
/// </summary>
protected int normCount;
/// <summary>
/// Oggetto connessioen REDIS
/// </summary>
protected RedisIobCache redisMan = new RedisIobCache();
/// <summary>
/// Generatore numeri random
/// </summary>
protected Random rndGen = new Random();
/// <summary>
/// Contatore campionamento memoria
/// </summary>
protected int sampleMemCount;
/// <summary>
/// Indica se inviare avvio adapter con FluxLog
/// </summary>
protected bool sendStartFLog = false;
/// <summary>
/// contatore lento
/// </summary>
protected int slowCount;
/// <summary>
/// contatore sync allarmi
/// </summary>
protected int verySlowCount;
/// <summary>
/// Temnpo attesa std in MS
/// </summary>
protected int waitRecMSec = 30000;
#endregion Protected Fields
#region Protected Properties
/// <summary>
/// Valore protected comunicazione PLC
/// </summary>
protected bool _commPlcActive { get; set; } = false;
/// <summary>
/// Valore protetto stato comunicazione
/// </summary>
protected int _commSrvActive { get; set; } = 0;
/// <summary>
/// Valore protected semaforo IN
/// </summary>
protected Semaforo _sIN { get; set; } = Semaforo.ND;
/// <summary>
/// Valore protected semaforo OUT
/// </summary>
protected Semaforo _sOUT { get; set; } = Semaforo.ND;
/// <summary>
/// Codice IOB della macchina cui connettersi (x scegliere corretto file di conf...)
/// </summary>
protected string CurrIOB { get; set; }
protected int delayShowLogMs { get; set; } = utils.CRI("delayShowLogMs");
/// <summary>
/// Dictionary dei divieti del datamonitor
/// </summary>
protected Dictionary<int, DateTime> dMonDisplVetoVeto { get; set; } = new Dictionary<int, DateTime>();
/// <summary>
/// array degli oggetti datamonitor da mostrare
/// </summary>
protected Dictionary<int, List<string>> dMonValues { get; set; } = new Dictionary<int, List<string>>();
/// <summary>
/// Veto a NUOVE scritture in COUNTER...
/// </summary>
protected DateTime logCounterVeto { get; set; } = DateTime.Now;
/// <summary>
/// Lista String da mostrare quale TaskLog corrente...
/// </summary>
protected List<string> logTaskString { get; set; } = new List<string>();
/// <summary>
/// Lista String da mostrare quale WatchLog corrente...
/// </summary>
protected ConcurrentQueue<string> logWatchString { get; set; } = new ConcurrentQueue<string>();
/// <summary>
/// Veto a NUOVE scritture in logWatch...
/// </summary>
protected DateTime logWatchWriteVeto { get; set; } = DateTime.Now;
protected int maxAlQueue { get; set; }
protected int maxEvQueue { get; set; }
protected int maxFlQueue { get; set; }
protected int maxMsQueue { get; set; }
protected int maxRwTrQueue { get; set; }
protected int maxUlQueue { get; set; }
protected int qAlLen { get; set; }
protected int qEvLen { get; set; }
protected int qFlLen { get; set; }
protected int qMsLen { get; set; }
protected int qRTrLen { get; set; }
protected int qUlLen { get; set; }
protected int totQueue
{
get
{
return qEvLen + qFlLen + qAlLen + qMsLen + qUlLen;
}
}
#endregion Protected Properties
#region Protected Methods
protected override void Dispose(bool disposing)
@@ -1179,26 +1199,6 @@ namespace IOB_WIN_NEXT
#endregion Protected Methods
#region Private Fields
/// <summary>
/// Dizionario dei valori bloccati x evitare log eccessivo
/// </summary>
private Dictionary<string, DateTime> vetoLogError = new Dictionary<string, DateTime>();
/// <summary>
/// Periodo di veto log in minuti
/// </summary>
private int vetoPeriodMin = 15;
#endregion Private Fields
#region Private Delegates
private delegate void SafeCallDelegate(string text);
#endregion Private Delegates
#region Private Methods
private void btnForceAutoOdl_Click(object sender, EventArgs e)
@@ -1515,7 +1515,7 @@ namespace IOB_WIN_NEXT
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void IobObj_eh_refreshed(object sender, iobRefreshedEventArgs e)
private void IobObj_eh_refreshed(object sender, Iob.iobRefreshedEventArgs e)
{
// aggiorno!
updateFormDisplay(e.DisplayDataObject);
@@ -1576,11 +1576,13 @@ namespace IOB_WIN_NEXT
optPar = optParRead,
versIOB = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString(),
codIOB = fIni.ReadString("IOB", "IOB_NAME", CurrIOB),
EnableRedisQueue = bool.Parse(fIni.ReadString("IOB", "EnableRedisQueue", "false")),
disableExeTask = bool.Parse(fIni.ReadString("IOB", "DIS_EXE_TASK", "false")),
disableStateCh = bool.Parse(fIni.ReadString("IOB", "DIS_STATE_CH", "false")),
filenameIOB = CurrIOB,
minDeltaSec = fIni.ReadInteger("IOB", "MinDeltaSec", 6),
cncIpAddr = fIni.ReadString("CNC", "IP", "::1"),
cncPingAddr = fIni.ReadString("CNC", "PING_IP", fIni.ReadString("CNC", "IP", "::1")),
cncPort = fIni.ReadString("CNC", "PORT", "0"),
iniFileName = iniConfFile,
cpuType = fIni.ReadString("CNC", "CPUTYPE", ""),
@@ -1591,7 +1593,8 @@ namespace IOB_WIN_NEXT
BLINK_FILT = Convert.ToInt32(fIni.ReadString("BLINK", "BLINK_FILT", "0")),
TCMaxDelayFactor = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_MAX_TC_FACTOR", "1.2").Replace(".", ",")),
TCLambda = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_LAMBDA", "0.5").Replace(".", ",")),
TCMaxIncrPz = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_MAX_INCR", "5").Replace(".", ","))
TCMaxIncrPz = Convert.ToDouble(fIni.ReadString("OPTPAR", "TC_MAX_INCR", "5").Replace(".", ",")),
waitRecMSec = Convert.ToInt32(fIni.ReadString("OPTPAR", "WAIT_REC_MSEC", "90000"))
};
lgDebug($"Creato IOBConf!");
@@ -1602,7 +1605,7 @@ namespace IOB_WIN_NEXT
string dirPath = $"{path}\\DATA\\{IOBConf.serverData.ClientInstall}";
string fullPath = $"{dirPath}\\{fileName}";
// verifica directory
Directory.CreateDirectory(dirPath);
baseUtils.checkDir(dirPath);
// salvataggio
File.WriteAllText(fullPath, confJson);
@@ -1627,179 +1630,184 @@ namespace IOB_WIN_NEXT
switch (tipoScelto)
{
case tipoAdapter.SIMULA:
iobObj = new IobSimula(this, IOBConf);
iobObj = new Iob.Simula(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.BECKHOFF:
case tipoAdapter.BECKHOFF_CPA:
iobObj = new IobBeckhoffCpa(this, IOBConf);
iobObj = new IobBeckhoff.BeckhoffCpa(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.FILE_GEN:
iobObj = new IobFile(this, IOBConf);
iobObj = new IobFile.FileGen(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.FILE_EUROM63:
iobObj = new IobFileEurom63(this, IOBConf);
iobObj = new IobFile.FileEurom63(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.FILE_SOITAAB:
iobObj = new IobFile.IobFileSoitaab(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.FANUC:
iobObj = new IobFanuc(this, IOBConf);
iobObj = new Iob.Fanuc(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.KAWASAKI:
iobObj = new IobKawasaki(this, IOBConf);
iobObj = new Iob.Kawasaki(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.IcoelDb:
iobObj = new IobIcoelDb(this, IOBConf);
iobObj = new IobSql.IcoelDb(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.IcoelSoap:
iobObj = new IobIcoelSoap(this, IOBConf);
iobObj = new IobNet.IcoelSoap(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP:
iobObj = new IobModbusTCP(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCP(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_CEDAX:
iobObj = new IobModbusTCPCedax(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPCedax(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_CENTERFRIGO:
iobObj = new IobModbusTCPCenterfrigo(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPCenterfrigo(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_FIMAT:
iobObj = new IobModbusTCPFimat(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPFimat(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_HAM:
iobObj = new IobModbusTCPHam(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPHam(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_HELPI:
iobObj = new IobModbusTCPHelpi(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPHelpi(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_IMAS_AEROMEC:
iobObj = new IobModbusTCPImaxAeromec(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPImaxAeromec(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_RIMOR:
iobObj = new IobModbusTCPRimor(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPRimor(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_SAIM:
iobObj = new IobModbusTCPSaim(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPSaim(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MODBUS_TCP_ZETAPACK:
iobObj = new IobModbusTCPZetapack(this, IOBConf);
iobObj = new IobModbusTCP.ModbusTCPZetapack(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.MTConnect:
iobObj = new IobMTC(this, IOBConf);
iobObj = new Iob.MTConnect(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OMRON:
iobObj = new IobOmron(this, IOBConf);
iobObj = new Iob.Omron(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUa:
iobObj = new IobOpcUa(this, IOBConf);
iobObj = new IobOpc.OpcUa(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaCMS:
case tipoAdapter.OpcUaSCM:
iobObj = new IobOpcUaCMS(this, IOBConf);
iobObj = new IobOpc.OpcUaCMS(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaEwon:
iobObj = new IobOpcUaEwon(this, IOBConf);
iobObj = new IobOpc.OpcUaEwon(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaEwonBLM:
iobObj = new IobOpcUaEwonBLM(this, IOBConf);
iobObj = new IobOpc.OpcUaEwonBLM(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaEwonMonti:
iobObj = new IobOpcUaEwonMonti(this, IOBConf);
iobObj = new IobOpc.OpcUaEwonMonti(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaEwonMecolpress:
iobObj = new IobOpcUaEwonMecolpress(this, IOBConf);
iobObj = new IobOpc.OpcUaEwonMecolpress(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaImasAeromec:
iobObj = new IobOpcUaImas(this, IOBConf);
iobObj = new IobOpc.OpcUaImas(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaMBH:
iobObj = new IobOpcUaMBH(this, IOBConf);
iobObj = new IobOpc.OpcUaMBH(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaMBHCimolai:
iobObj = new IobOpcUaMBHCimolai(this, IOBConf);
iobObj = new IobOpc.OpcUaMBHCimolai(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaOmron:
iobObj = new IobOpcUaOmron(this, IOBConf);
iobObj = new IobOpc.OpcUaOmron(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaOmronIcoel:
iobObj = new IobOpcUaOmronIcoel(this, IOBConf);
iobObj = new IobOpc.OpcUaOmronIcoel(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaSiemens:
iobObj = new IobOpcUaSiemens(this, IOBConf);
iobObj = new IobOpc.OpcUaSiemens(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaSiemensOMP:
iobObj = new IobOpcUaSiemensOMP(this, IOBConf);
iobObj = new IobOpc.OpcUaSiemensOMP(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.OpcUaUlma:
iobObj = new IobOpcUaUlma(this, IOBConf);
iobObj = new IobOpc.OpcUaUlma(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.PingWatchdog:
iobObj = new IobPing(this, IOBConf);
iobObj = new IobNet.Ping(this, IOBConf);
start.Enabled = true;
break;
@@ -1807,103 +1815,103 @@ namespace IOB_WIN_NEXT
case tipoAdapter.OSAI_CNDEX:
case tipoAdapter.OSAI_VB6:
// versione EgwProxy.OsaiCncLib
iobObj = new IobOSAI(this, IOBConf);
iobObj = new Iob.OSAI(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS:
iobObj = new IobSiemens(this, IOBConf);
iobObj = new IobSiemens.Siemens(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_APROCHIM:
iobObj = new IobSiemensAprochim(this, IOBConf);
iobObj = new IobSiemens.SiemensAprochim(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_AT2001:
iobObj = new IobSiemensAt2001(this, IOBConf);
iobObj = new IobSiemens.SiemensAt2001(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_COMECA:
iobObj = new IobSiemensComeca(this, IOBConf);
iobObj = new IobSiemens.SiemensComeca(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_COMUR:
iobObj = new IobSiemensComur(this, IOBConf);
iobObj = new IobSiemens.SiemensComur(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_COSMAP:
iobObj = new IobSiemensCosmap(this, IOBConf);
iobObj = new IobSiemens.SiemensCosmap(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_FAPE:
iobObj = new IobSiemensFape(this, IOBConf);
iobObj = new IobSiemens.SiemensFape(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_INGENIA:
iobObj = new IobSiemensIngenia(this, IOBConf);
iobObj = new IobSiemens.SiemensIngenia(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_LASCO:
iobObj = new IobSiemensLasco(this, IOBConf);
iobObj = new IobSiemens.SiemensLasco(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_NWSE:
iobObj = new IobSiemensNWSE(this, IOBConf);
iobObj = new IobSiemens.SiemensNWSE(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_PRESSOIL_CEI:
iobObj = new IobSiemensPressoilCei(this, IOBConf);
iobObj = new IobSiemens.SiemensPressoilCei(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_ROBOTSERVICE:
iobObj = new IobSiemensRobotService(this, IOBConf);
iobObj = new IobSiemens.SiemensRobotService(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_SAET:
iobObj = new IobSiemensSaet(this, IOBConf);
iobObj = new IobSiemens.SiemensSaet(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_SIMEC:
iobObj = new IobSiemensSimec(this, IOBConf);
iobObj = new IobSiemens.SiemensSimec(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SIEMENS_TORRI:
iobObj = new IobSiemensTorri(this, IOBConf);
iobObj = new IobSiemens.SiemensTorri(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SQLSERVER_LANTEK:
iobObj = new IobSqlServLantek(this, IOBConf);
iobObj = new IobSql.SqlServLantek(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.SQLSERVER_PAMA:
iobObj = new IobSqlServPama(this, IOBConf);
iobObj = new IobSql.SqlServPama(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.WPS:
iobObj = new IobWPS(this, IOBConf);
iobObj = new IobNet.WebPageScrap(this, IOBConf);
start.Enabled = true;
break;
case tipoAdapter.ND:
default:
iobObj = new IobSimula(this, IOBConf);
iobObj = new Iob.Simula(this, IOBConf);
start.Enabled = false;
break;
}
+45 -7
View File
@@ -111,15 +111,21 @@
</appSettings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="lib;libs" />
<probing privatePath="lib;libs" xmlns="" />
<dependentAssembly>
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.3" newVersion="6.0.0.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -130,12 +136,44 @@
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Web.WebView2.WinForms" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.1938.49" newVersion="1.0.1938.49" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Web.WebView2.Core" publicKeyToken="2a8ab48044d2601e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.1938.49" newVersion="1.0.1938.49" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
@@ -178,4 +216,4 @@
<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
</providers>
</entityFramework>
</configuration>
</configuration>
@@ -10,6 +10,7 @@ MODEL=Travel Lift
[CNC]
IP=192.168.60.234
PING_IP=192.168.60.235
PORT=48010
GETPRGNAME=true
@@ -45,8 +46,8 @@ MAX_COUNTER_BLINK = 30
BLINK_FILT=0
[OPTPAR]
AUTO_CHANGE_ODL=true
CHANGE_ODL_MODE=TIME
AUTO_CHANGE_ODL=TRUE
CHANGE_ODL_MODE=MACHINE
CHANGE_ODL_HOURS=24
CHANGE_ODL_IDLE_MIN=5
PZCOUNT_MODE=OPC
@@ -58,6 +59,7 @@ ENABLE_DYN_DATA=FALSE
FORCE_DYN_DATA=TRUE
ENABLE_DATA_FILTER=TRUE
ENABLE_CLI_RESTART=TRUE
MAX_ELAPSED_TIME_SEC=60
MAX_TRY_PING=3
DISABLE_SEND_WDST=TRUE
FTP_SERVER=192.168.60.234
@@ -68,16 +70,22 @@ FTP_SKIP=TRUE
FTP_LOC_DIR=temp\csv
FTP_REM_DIR=
CSV_ADD_HEADER=true
VETO_SEND_SNAPSHOT=3
;NO_PING=TRUE
;EXEMODE_CHECK_BYPASS=true
; conf aree allarme
ALARM_CONF=BAGLIETTO_CIMOLAI_01_alarm.json
;ALARM_CONF=CIMOLAI_01_alarm.json
; conf parametri memoria READ/WRITE
OPC_PARAM_CONF=BAGLIETTO_CIMOLAI_01.json
;OPC_PARAM_CONF=CIMOLAI_01.json
[BRANCH]
NAME=master
NAME=master
; Tags manuali
[TAGS]
Customer=Baglietto
HostOS=WIN
HostName=SRVBAG-TRAVEL
HostAddr=192.168.60.15
+2 -1
View File
@@ -67,7 +67,8 @@ FORCE_DYN_DATA=TRUE
DEM_FACT_DYN_DATA=5
ENABLE_DATA_FILTER=TRUE
ENABLE_CLI_RESTART=TRUE
SyncStateDb=localhost\sqlexpress
SyncStateServer=localhost\sqlexpress
SyncStateDb=MoonPro_ISF
SyncStateUser=egalware
SyncStatePwd=egalware2022
SyncStateCTout=
+5 -5
View File
@@ -5,11 +5,11 @@
"keyProgName": "Path_01_CurrProg",
"keyRunMode": "Path_01_RUN_MODE",
"pingAsPowerOn": true,
"condPowerOn":
{
"keyName": "POWER",
"targetValue": "OK"
},
"emergencyArmedTrue": false,
"condPowerOn": {
"keyName": "POWER",
"targetValue": "OK"
},
"condWork": [
{
"keyName": "Path_01_EXE_MODE",
+2
View File
@@ -72,6 +72,8 @@ SyncStateUser=steamware
SyncStatePwd=viadante16
SyncStateCTout=
VetoReadSec=2
VetoSyncSec=10
;FullPodlUrl=true
; clock base (da 10ms)
timerIntMs=20
+44 -43
View File
@@ -10,9 +10,37 @@
}
},
"mMapRead": {
"StatoLavorazione": {
"name": "01) StatoLavorazione",
"description": "Stato Lavorazione",
"memAddr": "421004",
"tipoMem": "Int",
"index": 21004,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 1,
"minVal": 0,
"maxVal": 999999,
"unit": "#"
},
"DurataLavorazione": {
"name": "02) DurataLavorazione",
"description": "Durata Lavorazione",
"memAddr": "421002",
"tipoMem": "Int",
"index": 21002,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 1,
"minVal": 0,
"maxVal": 999999,
"unit": "h/m"
},
"OreFunzFiltro1": {
"name": "OreFunzFiltro1",
"description": "Ore funzionamento filtro 1",
"description": "03) Filtro 1 Ore funzionamento",
"memAddr": "420201",
"tipoMem": "Int",
"index": 20201,
@@ -26,7 +54,7 @@
},
"MinFunzFiltro1": {
"name": "MinFunzFiltro1",
"description": "Minuti funzionamento filtro 1",
"description": "04) Filtro 1 Minuti funzionamento",
"memAddr": "420205",
"tipoMem": "Int",
"index": 20205,
@@ -40,7 +68,7 @@
},
"OreFunzFiltroPar1": {
"name": "OreFunzFiltroPar1",
"description": "Ore funzionamento filtro 1 (contatore parziale azzerabile)",
"description": "Filtro 1 (c) Ore funzionamento (contatore parziale azzerabile)",
"memAddr": "420203",
"tipoMem": "Int",
"index": 20203,
@@ -54,7 +82,7 @@
},
"MinFunzFiltroPar1": {
"name": "MinFunzFiltroPar1",
"description": "Minuti funzionamento filtro 1 (contatore parziale azzerabile)",
"description": "Filtro 1 (d) Minuti funzionamento (contatore parziale azzerabile)",
"memAddr": "420206",
"tipoMem": "Int",
"index": 20206,
@@ -68,7 +96,7 @@
},
"OreFunzFiltro2": {
"name": "OreFunzFiltro2",
"description": "Ore funzionamento filtro 2",
"description": "Filtro 2 (a) Ore funzionamento ",
"memAddr": "420301",
"tipoMem": "Int",
"index": 20301,
@@ -82,7 +110,7 @@
},
"MinFunzFiltro2": {
"name": "MinFunzFiltro2",
"description": "Minuti funzionamento filtro 2",
"description": "Filtro 2 (b) Minuti funzionamento",
"memAddr": "420305",
"tipoMem": "Int",
"index": 20305,
@@ -96,7 +124,7 @@
},
"OreFunzFiltroPar2": {
"name": "OreFunzFiltroPar2",
"description": "Ore funzionamento filtro 1 (contatore parziale azzerabile)",
"description": "Filtro 2 (c) Ore funzionamento (contatore parziale azzerabile)",
"memAddr": "420303",
"tipoMem": "Int",
"index": 20303,
@@ -110,7 +138,7 @@
},
"MinFunzFiltroPar2": {
"name": "MinFunzFiltroPar2",
"description": "Minuti funzionamento filtro 1 (contatore parziale azzerabile)",
"description": "Filtro 2 (d) Minuti funzionamento (contatore parziale azzerabile)",
"memAddr": "420306",
"tipoMem": "Int",
"index": 20306,
@@ -124,7 +152,7 @@
},
"OreFunzAspiratore": {
"name": "OreFunzAspiratore",
"description": "Ore funzionamento Aspiratore",
"description": "Aspiratore (a) Ore funzionamento",
"memAddr": "420401",
"tipoMem": "Int",
"index": 20401,
@@ -138,7 +166,7 @@
},
"MinFunzAspiratore": {
"name": "MinFunzAspiratore",
"description": "Minuti funzionamento Aspiratore",
"description": "Aspiratore (b) Minuti funzionamento",
"memAddr": "420405",
"tipoMem": "Int",
"index": 20405,
@@ -152,7 +180,7 @@
},
"OreFunzAspiratorePar": {
"name": "OreFunzAspiratorePar",
"description": "Ore funzionamento Aspiratore (contatore parziale azzerabile)",
"description": "Aspiratore (c) Ore funzionamento (contatore parziale azzerabile)",
"memAddr": "420403",
"tipoMem": "Int",
"index": 20403,
@@ -166,7 +194,7 @@
},
"MinFunzAspiratorePar": {
"name": "MinFunzAspiratorePar",
"description": "Minuti funzionamento Aspiratore (contatore parziale azzerabile)",
"description": "Aspiratore (d) Minuti funzionamento (contatore parziale azzerabile)",
"memAddr": "420406",
"tipoMem": "Int",
"index": 20406,
@@ -177,40 +205,13 @@
"minVal": 0,
"maxVal": 999999,
"unit": "m"
},
"DurataLavorazione": {
"name": "DurataLavorazione",
"description": "Durata Lavorazione",
"memAddr": "421002",
"tipoMem": "Int",
"index": 21002,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 1,
"minVal": 0,
"maxVal": 999999,
"unit": "h/m"
},
"StatoLavorazione": {
"name": "StatoLavorazione",
"description": "Stato Lavorazione",
"memAddr": "421004",
"tipoMem": "Int",
"index": 21004,
"size": 1,
"func": "MAX",
"period": 90,
"factor": 1,
"minVal": 0,
"maxVal": 999999,
"unit": "#"
}
},
"optMemPar": {
"AlarmIntCond": "421004|0=1",
"ManualIntCond": "421004|0=3",
"EndOrdIntCond": "421002|1=1",
//"AlarmIntCond": "421002|1=1",
"ManualIntCond": "421002|1=3",
//"EStopBitCond": "100040.0=1",
"WorkIntCond": "421004|0=2,4"
"WorkIntCond": "421002|1=2,4"
}
}
+4 -3
View File
@@ -208,9 +208,10 @@
}
},
"optMemPar": {
"AlarmIntCond": "406200|0=1",
"ManualIntCond": "406200|0=3",
"EndOrdIntCond": "406198|1=1",
//"AlarmIntCond": "406200|0=1",
"ManualIntCond": "406198|1=3",
//"EStopBitCond": "100040.0=1",
"WorkIntCond": "406200|0=2,4"
"WorkIntCond": "406198|1=2,4"
}
}
@@ -0,0 +1,89 @@
;Configurazione IOB-WIN
[IOB]
;Accesso gestione sync DB x LANTEK --> MoonPro_IOB_ISF --> Chiamate REST
CNCTYPE=SQLSERVER_LANTEK
PING_MS_TIMEOUT=500
MinDeltaSec=5
IOB_NAME=IMI_SOITAAB_Z2342
DIS_EXE_TASK=FALSE
DIS_STATE_CH=TRUE
[MACHINE]
VENDOR=SOITAAB
MODEL=Ossitaglio Z2342 + sw nesting LANTEK
[CNC]
IP=127.0.0.1
PORT=1443
GETPRGNAME=false
[SERVER]
MPIP=http://192.168.0.110
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
CMDALIVE=/IOB
CMDENABLED=/IOB/enabled/
CMDADV1=?valore=
CMDREBO=/sendReboot.aspx?idxMacchina=
CMDRAWTRANSF=/IOB/rawTransfJson/
[MEMORY]
ADDR_READ=DB9999.DBB0
ADDR_WRITE=DB9999.DBB0
SIZE_READ=0
SIZE_WRITE=0
;BIT0=CONN
;BIT1=DB60.DBB1
;BIT2=PZCOUNT.STD.DB700.DBW22
;BIT3=DB60.DBB3
;BIT4=DB60.DBB4
[BLINK]
;MAX_COUNTER_BLINK = 30
MAX_COUNTER_BLINK = 15
;bit0 = 0
;bit1 = 0
;bit2 = 1
;bit3 = 1
;bit4 = 1
;bit5 = 0
;bit6 = 0
;bit7 = 0
BLINK_FILT=0
;BLINK_FILT=28
[OPTPAR]
AUTO_CHANGE_ODL=false
CHANGE_ODL_MODE=TIME
CHANGE_ODL_HOURS=24
CHANGE_ODL_IDLE_MIN=5
PZCOUNT_MODE=PAMA
DISABLE_PZCOUNT=FALSE
ENABLE_SEND_PZC_BLOCK=TRUE
MIN_SEND_PZC_BLOCK=0
MAX_SEND_PZC_BLOCK=100
ENABLE_DYN_DATA=TRUE
FORCE_DYN_DATA=TRUE
DEM_FACT_DYN_DATA=5
ENABLE_DATA_FILTER=TRUE
ENABLE_CLI_RESTART=TRUE
DISABLE_SEND_WDST=TRUE
SyncStateServer=308SERVER60\LANTEK
SyncStateDb=MoonPro_IOB_ISF_LANTEK
SyncStateUser=steamware
SyncStatePwd=viadante16
SyncStateCTout=
VetoReadSec=2
VetoSyncSec=10
FullPodlUrl=true
; clock base (da 10ms)
timerIntMs=20
; conf parametri memoria READ/WRITE
PARAM_CONF=IMI_SOITAAB_Z2342_01.json
[BRANCH]
NAME=master
@@ -0,0 +1,10 @@
{
"mMapWrite": {
},
"mMapRead": {
},
"optKVP": {
//"path-remBase": "C:\\Temp"
"path-remBase": "\\\\ecs900\\Logs"
}
}
@@ -0,0 +1,83 @@
;Configurazione IOB-WIN
[IOB]
;Accesso gestione sync con FILE SOITAAB
CNCTYPE=FILE_SOITAAB
PING_MS_TIMEOUT=500
MinDeltaSec=5
IOB_NAME=IMI_SOITAAB_Z2342
DIS_EXE_TASK=TRUE
DIS_STATE_CH=FALSE
[MACHINE]
VENDOR=SOITAAB
MODEL=Ossitaglio Z2342
[CNC]
;IP=ecs900
IP=172.28.30.53
PORT=0
GETPRGNAME=false
[SERVER]
MPIP=http://192.168.0.110
MPURL=/MP/IO
CMDBASE=/IOB/input/
CMDFLOG=/IOB/flog/
CMDALIVE=/IOB
CMDENABLED=/IOB/enabled/
CMDADV1=?valore=
CMDREBO=/sendReboot.aspx?idxMacchina=
CMDRAWTRANSF=/IOB/rawTransfJson/
[MEMORY]
ADDR_READ=DB9999.DBB0
ADDR_WRITE=DB9999.DBB0
SIZE_READ=0
SIZE_WRITE=0
;BIT0=CONN
;BIT1=DB60.DBB1
;BIT2=PZCOUNT.STD.DB700.DBW22
;BIT3=DB60.DBB3
;BIT4=DB60.DBB4
[BLINK]
;MAX_COUNTER_BLINK = 30
MAX_COUNTER_BLINK = 15
;bit0 = 0
;bit1 = 0
;bit2 = 1
;bit3 = 1
;bit4 = 1
;bit5 = 0
;bit6 = 0
;bit7 = 0
BLINK_FILT=0
;BLINK_FILT=28
[OPTPAR]
AUTO_CHANGE_ODL=false
CHANGE_ODL_MODE=TIME
CHANGE_ODL_HOURS=24
CHANGE_ODL_IDLE_MIN=5
PZCOUNT_MODE=SOITAAB
DISABLE_PZCOUNT=FALSE
ENABLE_SEND_PZC_BLOCK=TRUE
MIN_SEND_PZC_BLOCK=0
MAX_SEND_PZC_BLOCK=100
ENABLE_DYN_DATA=TRUE
FORCE_DYN_DATA=TRUE
DEM_FACT_DYN_DATA=5
ENABLE_DATA_FILTER=TRUE
ENABLE_CLI_RESTART=TRUE
DISABLE_SEND_WDST=TRUE
VetoReadSec=5
; clock base (da 10ms)
timerIntMs=20
; conf parametri memoria READ/WRITE
PARAM_CONF=IMI_SOITAAB_Z2342_02.json
[BRANCH]
NAME=master
@@ -0,0 +1,10 @@
{
"mMapWrite": {
},
"mMapRead": {
},
"optKVP": {
//"path-remBase": "C:\\Temp"
"path-remBase": "\\\\ecs900\\Logs"
}
}
+10 -3
View File
@@ -45,12 +45,19 @@ CLI_INST=SteamWareSim
;STARTLIST=BAGLIETTO_CIMOLAI_01
;STARTLIST=SIMUL_01
;STARTLIST=GIACO_SAIM_003
;STARTLIST=SIMUL_01
;STARTLIST=PIZ09
;STARTLIST=IMI_RIMOR_SAB_01
;STARTLIST=IMI_RIMOR_SAB_02
;STARTLIST=IMI_RIMOR_VER_01
;STARTLIST=IMI_RIMOR_VER_02
;STARTLIST=IMI_RIMOR_SAB_01
STARTLIST=IMI_RIMOR_VER_01
;STARTLIST=IMI_PAMA_392
;STARTLIST=Tend_FIMAT_01
;STARTLIST=PIZ10
;STARTLIST=IMI_SOITAAB_Z2342_02
;STARTLIST=SIMUL_02
;NB: mettere copy always ai file di conf x fare test...
;STARTLIST=SIMUL_01
STARTLIST=PING
MAXCNC=10
+5 -1
View File
@@ -2,13 +2,16 @@
[IOB]
CNCTYPE=PingWatchdog
PING_MS_TIMEOUT=500
;IOB_NAME=SIMUL_09
IOB_NAME=SIMUL_01
[MACHINE]
VENDOR=STEAMWARE
MODEL=WATCHDOG
[CNC]
IP=10.74.83.112
IP=10.74.83.183
;IP=10.74.82.253
PORT=0000
[SERVER]
@@ -31,6 +34,7 @@ MAX_COUNTER_BLINK = 15
BLINK_FILT=0
[OPTPAR]
VETO_QUEUE_IN=15
AUTO_CHANGE_ODL=false
POWEROFF_TIMEOUT_SEC=60

Some files were not shown because too many files have changed in this diff Show More