diff --git a/C2P/C2P.csproj b/C2P/C2P.csproj index 45dacf8..568e635 100644 --- a/C2P/C2P.csproj +++ b/C2P/C2P.csproj @@ -291,6 +291,7 @@ + @@ -525,6 +526,13 @@ Home.aspx + + Import.aspx + ASPXCodeBehind + + + Import.aspx + JumboPage.master ASPXCodeBehind diff --git a/C2P/Images/LogoCostimate.png b/C2P/Images/LogoCostimate.png index 4cc5842..8e69905 100644 Binary files a/C2P/Images/LogoCostimate.png and b/C2P/Images/LogoCostimate.png differ diff --git a/C2P/Import.aspx b/C2P/Import.aspx new file mode 100644 index 0000000..f8e13bd --- /dev/null +++ b/C2P/Import.aspx @@ -0,0 +1 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/c2p/FullPage.master" AutoEventWireup="true" CodeBehind="Import.aspx.cs" Inherits="C2P.Import" %> diff --git a/C2P/Import.aspx.cs b/C2P/Import.aspx.cs new file mode 100644 index 0000000..81c8953 --- /dev/null +++ b/C2P/Import.aspx.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace C2P +{ + public partial class Import : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/C2P/Import.aspx.designer.cs b/C2P/Import.aspx.designer.cs new file mode 100644 index 0000000..2cbf570 --- /dev/null +++ b/C2P/Import.aspx.designer.cs @@ -0,0 +1,17 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace C2P +{ + + + public partial class Import + { + } +} diff --git a/C2P/Web.WinLab.config b/C2P/Web.WinLab.config index d014a25..cf3f5d7 100644 --- a/C2P/Web.WinLab.config +++ b/C2P/Web.WinLab.config @@ -17,6 +17,7 @@ + diff --git a/C2P/WebUserControls/mod_testata.ascx b/C2P/WebUserControls/mod_testata.ascx index 1873920..5d51bac 100644 --- a/C2P/WebUserControls/mod_testata.ascx +++ b/C2P/WebUserControls/mod_testata.ascx @@ -87,7 +87,8 @@ <%--
  • Settings
  • --%>
  • Gestione Voc
    • -
  • User Admin
    • +
  • <%: traduci("ImportData") %>
    • +
  • <%: traduci("UserAdmin") %>
  • Update Voc
    • diff --git a/C2P/WebUserControls/mod_testata.ascx.cs b/C2P/WebUserControls/mod_testata.ascx.cs index 0b12861..0bcffd5 100644 --- a/C2P/WebUserControls/mod_testata.ascx.cs +++ b/C2P/WebUserControls/mod_testata.ascx.cs @@ -100,6 +100,7 @@ namespace C2P.WebUserControls } } liUserAdmin.Visible = userIsSuperAdmin; + liImport.Visible = userIsSuperUser; } /// /// verifica che la pagina sia tra quelle autorizzate x l'utente @@ -257,6 +258,16 @@ namespace C2P.WebUserControls return devicesAuthProxy.stObj.userHasRight("SuperAdmin"); } } + /// + /// verifica se utente sia SuperUser + /// + public bool userIsSuperUser + { + get + { + return devicesAuthProxy.stObj.userHasRight("SuperUser"); + } + } #if false /// /// modifica campo ricerca... diff --git a/C2P/WebUserControls/mod_testata.ascx.designer.cs b/C2P/WebUserControls/mod_testata.ascx.designer.cs index 6458d1d..e4710b9 100644 --- a/C2P/WebUserControls/mod_testata.ascx.designer.cs +++ b/C2P/WebUserControls/mod_testata.ascx.designer.cs @@ -48,6 +48,15 @@ namespace C2P.WebUserControls { /// protected global::System.Web.UI.HtmlControls.HtmlImage imgLogo; + /// + /// liImport control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl liImport; + /// /// liUserAdmin control. /// diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll index 3a36a97..5df4e4d 100644 Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll index 0170f6a..24a01fe 100644 Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll index 80634d4..3b7bb79 100644 Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ diff --git a/C2P_Project/bin/Output/C2P_DB.dacpac b/C2P_Project/bin/Output/C2P_DB.dacpac index b768a8c..adb07c3 100644 Binary files a/C2P_Project/bin/Output/C2P_DB.dacpac and b/C2P_Project/bin/Output/C2P_DB.dacpac differ diff --git a/C2P_Project/bin/Output/C2P_DB_Create.sql b/C2P_Project/bin/Output/C2P_DB_Create.sql index 6d8f897..e91b5c3 100644 --- a/C2P_Project/bin/Output/C2P_DB_Create.sql +++ b/C2P_Project/bin/Output/C2P_DB_Create.sql @@ -15412,339 +15412,6 @@ WHERE QuoteType = @QuoteType RETURN GO -PRINT N'Creating [dbo].[stp_zzz_scratchDatiDemo]...'; - - -GO - - - --- ============================================= --- Author: G.A.R. --- Create date: 2014.05.12 --- Description: Procedura sostituzione dati con dati DEMO --- ============================================= -CREATE PROCEDURE [dbo].[stp_zzz_scratchDatiDemo] -AS -BEGIN - - -- dichiaro e imposto periodo di calcolo dei valori - -- andrà impostato in una tabella e mi determinerà la versione dei dati - DECLARE @dateFrom AS DateTime; - DECLARE @dateTo AS DateTime; - - SET @dateFrom = '20100101' - SET @dateTo = '20130929' - - -- ========================================== - -- IMPORTAZIONE DATI CSV --- QUI NON SERVER DATI GIA' CARICATI - -- ========================================== - -- exec tmp.importProductionLogRaw - --exec tmp.importClientsRaw - --exec tmp.importTranspCostRaw - --exec tmp.importItemsRaw - --exec tmp.importPackagRaw - --exec tmp.importDiesRaw - -- -- questo sotto va fatto solo se ci sono dati da integrare in DiesRaw - --exec tmp.importDiesGroupRaw - --select top 10 * FROM tmp.ProductionLogRaw - --select * FROM tmp.ClientsRaw - --select * FROM tmp.ItemsRaw - --select * FROM tmp.PackagRaw - --select * FROM tmp.DiesRaw - --select * FROM tmp.DiesGroupRaw - - -- Se ci sono record con Item doppi li cancello???? - --SELECT CodItem,COUNT(*) as qty - --FROM ( SELECT DISTINCT * FROM tmp.ItemsRaw ) AS a - --GROUP BY CodItem - --having COUNT(*)>1 - - --delete from tmp.ItemsRaw - --where CodItem IN - --( - -- SELECT CodItem - -- FROM ( SELECT DISTINCT * FROM tmp.ItemsRaw ) AS a - -- GROUP BY CodItem - -- having COUNT(*)>1 - --) - - - -- =========================================================== - -- CARICO DATI IN RAW EXT ( da Char a Tipi corretti ) cancella e carica da Tabelle TMP - -- =========================================================== - exec tmp.convertClientsRaw - exec tmp.convertTranspCostRaw - exec tmp.convertItemsRaw - exec tmp.convertProductionLogRaw - exec tmp.convertPackagRaw - exec tmp.convertDiesRaw - - -- necessario se integriamo i dati x i gruppi di matrici con un file - exec tmp.convertDiesGroupRaw --- exec tmp.convertDiesGroupRaw 'DiesDet' -- integro i gruppi mancanti ??? TOLTO - - select top 10 * FROM ext.ProductionLogRaw - select * FROM ext.ClientsRaw - select * FROM ext.ItemsRaw - select * FROM ext.PackagRaw - select * FROM ext.DiesRaw - SELECT * FROM ext.DiesGroupRaw - - -- elimino a mano dato con oltre 68 anni di evento... prob. non serve più - --select * - ----delete - --from ext.ProductionLogRaw where DATEDIFF(YEAR,EventStart,EventEnd)> 10 - - -- ======================================= - -- cancello le tabelle che ricarico - -- ======================================= - - -- exec ext.stp_mergeAgentsDet -- NON DEMO campi non modificati x DEMO - - TRUNCATE TABLE dbo.ProductionLog - TRUNCATE TABLE dbo.Package2ItemClient - TRUNCATE TABLE dbo.Package2Item - TRUNCATE TABLE dbo.Cost2Plant -- forse meglio non cancellarli e sostituirli in import? ma se non li ho in anagrafica non riesco!!! - DELETE FROM dbo.PlantsDet - DELETE FROM dbo.ClientDet - - exec ext.stp_mergeClientDet 'ProductionLogRaw' - exec ext.stp_mergeClientDet 'ClientsRaw' - - -- exec ext.stp_mergeTranspCostDet 'TranspCostRaw' -- NON DEMO - exec ext.stp_mergePlantsDet - -- exec ext.stp_mergeCost2Plant non carica i valori caricati a mano dopo - - TRUNCATE TABLE dbo.DiesDet - DELETE FROM dbo.DiesGroupDet - DELETE FROM dbo.ItemDet - exec ext.stp_mergeItemDet 'ItemsRaw' - exec ext.stp_mergePackagDet 'ProductionLogRaw' -- 'PackagRaw' - - exec ext.stp_mergeDiesDet - -- se ricarico diesgroup... ricarico solo i campi che nel file sono <> '' - exec ext.stp_mergeDiesGroupDet - - DELETE FROM dbo.RawMatDet - exec ext.stp_mergeRawMat - exec ext.stp_updateProductionLog - - --DECLARE @dateFrom AS DateTime; - --DECLARE @dateTo AS DateTime; - - --SET @dateFrom = '20100101' - --SET @dateTo = '20130929' - exec ext.stp_mergePackage2ItemClient 'ProductionLog', @dateFrom, @dateTo - exec ext.stp_mergePackage2Item 'ProductionLog', @dateFrom, @dateTo - exec ext.stp_mergePackage2 'ProductionLog', @dateFrom, @dateTo - - -- ========================================================================= - -- aggiorno CodPlan nelle Utilities ( sono state caricate a mano ??? ) - -- ========================================================================= - SELECT * FROM utilities - UPDATE Utilities - SET CodPlant = tp.CodPlantNew - FROM Utilities AS u - INNER JOIN TrascPlan tp ON u.CodPlant = tp.CodPlant - - ---- aggiorno quota agenti a 0.037 - ----update AgentsDet set quotaperc=0.0374 - - --SELECT DISTINCT dr.CodItem FROM ext.DiesRaw dr LEFT OUTER JOIN ItemDet id ON dr.CodItem = id.CodItem - --where id.CodItemGroup is null - - select * from ClientDet - select * from ItemDet - select * from Package2ItemClient - select * from Package2Item - select * from Package2 - select * from PackagDet - select * from DiesGroupDet where EOLLife > 0 - select * from DiesDet - select * from DiesGroupDet - select * from AgentsDet - select * from PlantsDet - select * from Cost2Plant - select * from utilities - select top 100 * from ProductionLog - - --update tmp.ProductionLogRaw - --set - -- okPr = 1 - -- , okDi = 1 - -- , okQM = 1 - -- , okSc = 1 - - --select distinct ProcessNum from ProductionLog - --select top 10 * from ext.ProductionLogRaw - - ---- fix errore packaging - --update tmp.ProductionLogRaw - --SET CodPackag='4' - --where CodPackag LIKE '%4%' and CodPackag <> '4' - --select * from tmp.ProductionLogRaw where CodPackag LIKE '%4%' and CodPackag <> '4' - - --SELECT p.CodDies, CodItem, CodClient, CodPackag, p.* FROM ext.ProductionLogRaw AS p - --LEFT JOIN dbo.DiesDet AS d ON p.CodDies = d.CodDies - --WHERE CodItem IS NULL - - -- =========================== - -- parte CALCOLI!!! - -- =========================== - - TRUNCATE TABLE [dbo].[QuoteWorkInt] - TRUNCATE TABLE [dbo].[QuoteWorkExt] - TRUNCATE TABLE [dbo].QuoteParam - TRUNCATE TABLE [dbo].QuoteOC - TRUNCATE TABLE [dbo].[QuoteFull_Q] - - --TRUNCATE TABLE [dbo].QuoteRM -- controllare prima di cancellare - --DELETE FROM QuoteList - - SELECT * FROM QuoteList - SELECT TOP 1000 * FROM QuoteRM - - --select * from ClientDet where CodClient='05000001048' - --select * from itemdet - --where CodItem like '1PT00102%' - - select * from RawMatDet - - --Q 1312130001 0 05000001048 1PT00102 A 7020 7673,400 1000 CPT NULL NULL NULL NULL - - SELECT --TOP 10 - dd.CodItem, pl.RawMat, dd.CodItem + '-' + pl.RawMat as KeyAM, dd.CodDiesGroup, pl.CodPlant, dd.HoleNum - ,dd.CodItem + '-' + pl.RawMat + '-' + pl.CodPlant + '-' + CAST(dd.HoleNum AS NVARCHAR(19)) as KeyAMIL - ,0 as NumSMED -- numero cambi, da sistemare... - , SUM(QtyOUT) as KgTeorici, SUM(Duration) AS Durata - ,ISNULL(SUM(QtyOUT),0)/ISNULL(SUM(Duration), 1) as ProduttTeo - FROM ProductionLog pl INNER JOIN DiesDet dd ON pl.CodDies=dd.CodDies - WHERE pl.ProcessNum='01' and pl.EventType=1 - GROUP BY dd.CodItem, pl.RawMat, dd.CodDiesGroup, pl.CodPlant, dd.HoleNum - ORDER BY dd.CodItem, pl.RawMat, dd.CodDiesGroup, SUM(QtyOUT) DESC - - -- ========================================== - -- re-insert dei dati di produzione x statistiche - -- ========================================== - --DECLARE @dateFrom AS DateTime; - --DECLARE @dateTo AS DateTime; - --SET @dateFrom = '20100101' - --SET @dateTo = '20130929' - - exec stp_TPS_upsert @dateFrom, @dateTo - exec stp_TD_upsert @dateFrom , @dateTo --- exec stp_TI_upsert @dateFrom , @dateTo -- adesso sono già calcolati e inseriti in Package2 / Package2Item - - SELECT TOP 1000 * FROM TabProdSc - SELECT TOP 1000 * FROM TabDifett - - -- ========================================== - -- salvo nuova revisione dati di produzione... - -- Va messa in ogni procedura di update con 'procedura' e versione anno-mese-giorno - -- ========================================== - --INSERT INTO RevHistory - --SELECT 'P', ISNULL(MAX(RevNum),0) + 1, GETDATE(), 'Aggiornamento dati di produzione x fase 04 ' + CONVERT(NVARCHAR(20), @dateFrom, 120) + ' --> ' +CONVERT(NVARCHAR(20), @dateTo, 120) - --FROM RevHistory - --WHERE RevType = 'P' - -- AND RevNum = 1 -- mod. 14/05 GCARLO altrimenti ne crea una per ogni riga di RevHistory - - --select * from RevHistory - - -- simulazione tempo di calcolo: circa 50/sec - ---- aggiornamento dei dati dell'offerta in oggetto - --DECLARE @tick DATETIME, - -- @idx INT = 100 - --SET @tick = GETDATE() - --WHILE @idx > 0 - --BEGIN - -- EXEC stp_QL_update 'Q', 1312130001, 0 - -- SELECT @idx = @idx - 1 - --END - --SELECT GETDATE() - @tick as tempo - -/* - ARRIVATO QUI - da errore la funzione f_getSubstring perchè ritorna NULL al posto di '' ??? riga della stored 295 dovuto a trasformazione dei gruppi Dies - sistemato -*/ - - -- prima aggiorno i dati di Cost2Plant che non si sa da dove arrivano ( caricati a mano??? ) - - SELECT TOP 1000 * FROM Cost2Plant - SELECT TOP 1000 * FROM Proxima_C2P.dbo.Cost2Plant - SELECT * from TrascPlan - - DELETE FROM Cost2Plant - - INSERT INTO Cost2Plant - SELECT t.CodPlantNew, ProcessNum, FC, VC, OH, SC, QuotaPlantStd, QuotaManStd - FROM Proxima_C2P.dbo.Cost2Plant AS cp - LEFT JOIN TrascPlan AS t ON cp.CodPlant = t.CodPlant - - -- GCARLO DEVO creare la riga per il test, la copio da quella di sviluppo e agg. i dati di demo - SELECT TOP 1000 * FROM QuoteList - SELECT TOP 1000 * FROM QuoteRM - SELECT TOP 1000 * FROM Proxima_C2P.dbo.QuoteList - SELECT TOP 1000 * FROM Proxima_C2P.dbo.QuoteRM WHERE CodQuote = '1402050001' - - -- creo righe di test - INSERT QuoteList - SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClientNew, CodItemNew, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, valid, errorScore - FROM Proxima_C2P.[dbo].[QuoteList] AS q - INNER JOIN [dbo].[TrascClient] AS tc ON q.CodClient = tc.CodClient - INNER JOIN dbo.TrascItem AS ti ON q.CodItem = ti.CodItem - - INSERT QuoteRM - SELECT QuoteType, CodQuote, QuoteRev, NumRM, RawMat, RawMatCost, RawMatExtraCost, CodPackag, FCR, valid - FROM Proxima_C2P.[dbo].[QuoteRM] - - UPDATE QuoteList - SET CodClient = ( SELECT CodClientNew FROM TrascClient WHERE CodClient = '05000000382' ) - ,CodItem = ( SELECT CodItemNew FROM TrascItem WHERE CodItem = '3DI05376' ) - WHERE CodQuote = '1402050001' - - -- *** ESEGUO L'AGGIORNAMENTO **** - - DECLARE @QuoteType CHAR(1) = 'Q', - @CodQuote BIGINT = 1402050001, - @QuoteRev INT = 0, - @PriceOff DECIMAL(9, 6) = 0 - - -- EXEC stp_QL_update 'Q', 1402050001, 0 -- <<<<< ERRORE - -- EXECUTE dbo.stp_QuoteFull_Q_update 'Q', 1402050001, 0, 0.1 -- crea il record in QuoteFull_Q - - EXEC stp_QL_update @QuoteType, @CodQuote, @QuoteRev - SELECT @PriceOff = PriceOff FROM QuoteList WHERE CodQuote= @CodQuote AND QuoteRev = @QuoteRev - EXECUTE dbo.stp_QuoteFull_Q_update @QuoteType, @CodQuote, @QuoteRev -- crea il record in QuoteFull_Q - - SELECT * FROM QuoteList WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev - SELECT * FROM QuoteRM WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev - SELECT * FROM QuoteWorkInt WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev - SELECT * FROM QuoteWorkExt WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev - SELECT * FROM QuoteOC WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev - SELECT * FROM QuoteParam WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev - - select top 10 * from ItemDet - - SELECT * FROM RawMatDet - - SELECT top 10 * FROM TabProdSc - SELECT top 10 * FROM TabDifett --- SELECT * FROM TabImbArt --- SELECT * FROM TabImbGrp - SELECT * FROM PackagDet - SELECT * FROM Package2 - - ---- test gestione selezione CodPackag corretto - --SELECT TOP 5 * FROM Package2ItemClient - --SELECT TOP 5 * FROM Package2Item - --SELECT TOP 5 * FROM Package2 - - -- SELECT dbo.f_getCodPackag('1EL00005', '05000001048') - --SELECT dbo.f_getCodPackag('1AN00001', '05000000137') - - -END -GO PRINT N'Creating [dbo].[stp_QLS_UpdDiesPar]...'; @@ -16493,6 +16160,339 @@ TRUNCATE TABLE dbo.OrdersHist */ GO +PRINT N'Creating [dbo].[stp_zzz_scratchDatiDemo]...'; + + +GO + + + +-- ============================================= +-- Author: G.A.R. +-- Create date: 2014.05.12 +-- Description: Procedura sostituzione dati con dati DEMO +-- ============================================= +CREATE PROCEDURE [dbo].[stp_zzz_scratchDatiDemo] +AS +BEGIN + + -- dichiaro e imposto periodo di calcolo dei valori + -- andrà impostato in una tabella e mi determinerà la versione dei dati + DECLARE @dateFrom AS DateTime; + DECLARE @dateTo AS DateTime; + + SET @dateFrom = '20100101' + SET @dateTo = '20130929' + + -- ========================================== + -- IMPORTAZIONE DATI CSV --- QUI NON SERVER DATI GIA' CARICATI + -- ========================================== + -- exec tmp.importProductionLogRaw + --exec tmp.importClientsRaw + --exec tmp.importTranspCostRaw + --exec tmp.importItemsRaw + --exec tmp.importPackagRaw + --exec tmp.importDiesRaw + -- -- questo sotto va fatto solo se ci sono dati da integrare in DiesRaw + --exec tmp.importDiesGroupRaw + --select top 10 * FROM tmp.ProductionLogRaw + --select * FROM tmp.ClientsRaw + --select * FROM tmp.ItemsRaw + --select * FROM tmp.PackagRaw + --select * FROM tmp.DiesRaw + --select * FROM tmp.DiesGroupRaw + + -- Se ci sono record con Item doppi li cancello???? + --SELECT CodItem,COUNT(*) as qty + --FROM ( SELECT DISTINCT * FROM tmp.ItemsRaw ) AS a + --GROUP BY CodItem + --having COUNT(*)>1 + + --delete from tmp.ItemsRaw + --where CodItem IN + --( + -- SELECT CodItem + -- FROM ( SELECT DISTINCT * FROM tmp.ItemsRaw ) AS a + -- GROUP BY CodItem + -- having COUNT(*)>1 + --) + + + -- =========================================================== + -- CARICO DATI IN RAW EXT ( da Char a Tipi corretti ) cancella e carica da Tabelle TMP + -- =========================================================== + exec tmp.convertClientsRaw + exec tmp.convertTranspCostRaw + exec tmp.convertItemsRaw + exec tmp.convertProductionLogRaw + exec tmp.convertPackagRaw + exec tmp.convertDiesRaw + + -- necessario se integriamo i dati x i gruppi di matrici con un file + exec tmp.convertDiesGroupRaw +-- exec tmp.convertDiesGroupRaw 'DiesDet' -- integro i gruppi mancanti ??? TOLTO + + select top 10 * FROM ext.ProductionLogRaw + select * FROM ext.ClientsRaw + select * FROM ext.ItemsRaw + select * FROM ext.PackagRaw + select * FROM ext.DiesRaw + SELECT * FROM ext.DiesGroupRaw + + -- elimino a mano dato con oltre 68 anni di evento... prob. non serve più + --select * + ----delete + --from ext.ProductionLogRaw where DATEDIFF(YEAR,EventStart,EventEnd)> 10 + + -- ======================================= + -- cancello le tabelle che ricarico + -- ======================================= + + -- exec ext.stp_mergeAgentsDet -- NON DEMO campi non modificati x DEMO + + TRUNCATE TABLE dbo.ProductionLog + TRUNCATE TABLE dbo.Package2ItemClient + TRUNCATE TABLE dbo.Package2Item + TRUNCATE TABLE dbo.Cost2Plant -- forse meglio non cancellarli e sostituirli in import? ma se non li ho in anagrafica non riesco!!! + DELETE FROM dbo.PlantsDet + DELETE FROM dbo.ClientDet + + exec ext.stp_mergeClientDet 'ProductionLogRaw' + exec ext.stp_mergeClientDet 'ClientsRaw' + + -- exec ext.stp_mergeTranspCostDet 'TranspCostRaw' -- NON DEMO + exec ext.stp_mergePlantsDet + -- exec ext.stp_mergeCost2Plant non carica i valori caricati a mano dopo + + TRUNCATE TABLE dbo.DiesDet + DELETE FROM dbo.DiesGroupDet + DELETE FROM dbo.ItemDet + exec ext.stp_mergeItemDet 'ItemsRaw' + exec ext.stp_mergePackagDet 'ProductionLogRaw' -- 'PackagRaw' + + exec ext.stp_mergeDiesDet + -- se ricarico diesgroup... ricarico solo i campi che nel file sono <> '' + exec ext.stp_mergeDiesGroupDet + + DELETE FROM dbo.RawMatDet + exec ext.stp_mergeRawMat + exec ext.stp_updateProductionLog + + --DECLARE @dateFrom AS DateTime; + --DECLARE @dateTo AS DateTime; + + --SET @dateFrom = '20100101' + --SET @dateTo = '20130929' + exec ext.stp_mergePackage2ItemClient 'ProductionLog', @dateFrom, @dateTo + exec ext.stp_mergePackage2Item 'ProductionLog', @dateFrom, @dateTo + exec ext.stp_mergePackage2 'ProductionLog', @dateFrom, @dateTo + + -- ========================================================================= + -- aggiorno CodPlan nelle Utilities ( sono state caricate a mano ??? ) + -- ========================================================================= + SELECT * FROM utilities + UPDATE Utilities + SET CodPlant = tp.CodPlantNew + FROM Utilities AS u + INNER JOIN TrascPlan tp ON u.CodPlant = tp.CodPlant + + ---- aggiorno quota agenti a 0.037 + ----update AgentsDet set quotaperc=0.0374 + + --SELECT DISTINCT dr.CodItem FROM ext.DiesRaw dr LEFT OUTER JOIN ItemDet id ON dr.CodItem = id.CodItem + --where id.CodItemGroup is null + + select * from ClientDet + select * from ItemDet + select * from Package2ItemClient + select * from Package2Item + select * from Package2 + select * from PackagDet + select * from DiesGroupDet where EOLLife > 0 + select * from DiesDet + select * from DiesGroupDet + select * from AgentsDet + select * from PlantsDet + select * from Cost2Plant + select * from utilities + select top 100 * from ProductionLog + + --update tmp.ProductionLogRaw + --set + -- okPr = 1 + -- , okDi = 1 + -- , okQM = 1 + -- , okSc = 1 + + --select distinct ProcessNum from ProductionLog + --select top 10 * from ext.ProductionLogRaw + + ---- fix errore packaging + --update tmp.ProductionLogRaw + --SET CodPackag='4' + --where CodPackag LIKE '%4%' and CodPackag <> '4' + --select * from tmp.ProductionLogRaw where CodPackag LIKE '%4%' and CodPackag <> '4' + + --SELECT p.CodDies, CodItem, CodClient, CodPackag, p.* FROM ext.ProductionLogRaw AS p + --LEFT JOIN dbo.DiesDet AS d ON p.CodDies = d.CodDies + --WHERE CodItem IS NULL + + -- =========================== + -- parte CALCOLI!!! + -- =========================== + + TRUNCATE TABLE [dbo].[QuoteWorkInt] + TRUNCATE TABLE [dbo].[QuoteWorkExt] + TRUNCATE TABLE [dbo].QuoteParam + TRUNCATE TABLE [dbo].QuoteOC + TRUNCATE TABLE [dbo].[QuoteFull_Q] + + --TRUNCATE TABLE [dbo].QuoteRM -- controllare prima di cancellare + --DELETE FROM QuoteList + + SELECT * FROM QuoteList + SELECT TOP 1000 * FROM QuoteRM + + --select * from ClientDet where CodClient='05000001048' + --select * from itemdet + --where CodItem like '1PT00102%' + + select * from RawMatDet + + --Q 1312130001 0 05000001048 1PT00102 A 7020 7673,400 1000 CPT NULL NULL NULL NULL + + SELECT --TOP 10 + dd.CodItem, pl.RawMat, dd.CodItem + '-' + pl.RawMat as KeyAM, dd.CodDiesGroup, pl.CodPlant, dd.HoleNum + ,dd.CodItem + '-' + pl.RawMat + '-' + pl.CodPlant + '-' + CAST(dd.HoleNum AS NVARCHAR(19)) as KeyAMIL + ,0 as NumSMED -- numero cambi, da sistemare... + , SUM(QtyOUT) as KgTeorici, SUM(Duration) AS Durata + ,ISNULL(SUM(QtyOUT),0)/ISNULL(SUM(Duration), 1) as ProduttTeo + FROM ProductionLog pl INNER JOIN DiesDet dd ON pl.CodDies=dd.CodDies + WHERE pl.ProcessNum='01' and pl.EventType=1 + GROUP BY dd.CodItem, pl.RawMat, dd.CodDiesGroup, pl.CodPlant, dd.HoleNum + ORDER BY dd.CodItem, pl.RawMat, dd.CodDiesGroup, SUM(QtyOUT) DESC + + -- ========================================== + -- re-insert dei dati di produzione x statistiche + -- ========================================== + --DECLARE @dateFrom AS DateTime; + --DECLARE @dateTo AS DateTime; + --SET @dateFrom = '20100101' + --SET @dateTo = '20130929' + + exec stp_TPS_upsert @dateFrom, @dateTo + exec stp_TD_upsert @dateFrom , @dateTo +-- exec stp_TI_upsert @dateFrom , @dateTo -- adesso sono già calcolati e inseriti in Package2 / Package2Item + + SELECT TOP 1000 * FROM TabProdSc + SELECT TOP 1000 * FROM TabDifett + + -- ========================================== + -- salvo nuova revisione dati di produzione... + -- Va messa in ogni procedura di update con 'procedura' e versione anno-mese-giorno + -- ========================================== + --INSERT INTO RevHistory + --SELECT 'P', ISNULL(MAX(RevNum),0) + 1, GETDATE(), 'Aggiornamento dati di produzione x fase 04 ' + CONVERT(NVARCHAR(20), @dateFrom, 120) + ' --> ' +CONVERT(NVARCHAR(20), @dateTo, 120) + --FROM RevHistory + --WHERE RevType = 'P' + -- AND RevNum = 1 -- mod. 14/05 GCARLO altrimenti ne crea una per ogni riga di RevHistory + + --select * from RevHistory + + -- simulazione tempo di calcolo: circa 50/sec + ---- aggiornamento dei dati dell'offerta in oggetto + --DECLARE @tick DATETIME, + -- @idx INT = 100 + --SET @tick = GETDATE() + --WHILE @idx > 0 + --BEGIN + -- EXEC stp_QL_update 'Q', 1312130001, 0 + -- SELECT @idx = @idx - 1 + --END + --SELECT GETDATE() - @tick as tempo + +/* + ARRIVATO QUI - da errore la funzione f_getSubstring perchè ritorna NULL al posto di '' ??? riga della stored 295 dovuto a trasformazione dei gruppi Dies - sistemato +*/ + + -- prima aggiorno i dati di Cost2Plant che non si sa da dove arrivano ( caricati a mano??? ) + + SELECT TOP 1000 * FROM Cost2Plant + SELECT TOP 1000 * FROM C2P.dbo.Cost2Plant + SELECT * from TrascPlan + + DELETE FROM Cost2Plant + + INSERT INTO Cost2Plant + SELECT t.CodPlantNew, ProcessNum, FC, VC, OH, SC, QuotaPlantStd, QuotaManStd + FROM C2P.dbo.Cost2Plant AS cp + LEFT JOIN TrascPlan AS t ON cp.CodPlant = t.CodPlant + + -- GCARLO DEVO creare la riga per il test, la copio da quella di sviluppo e agg. i dati di demo + SELECT TOP 1000 * FROM QuoteList + SELECT TOP 1000 * FROM QuoteRM + SELECT TOP 1000 * FROM C2P.dbo.QuoteList + SELECT TOP 1000 * FROM C2P.dbo.QuoteRM WHERE CodQuote = '1402050001' + + -- creo righe di test + INSERT QuoteList + SELECT QuoteType, CodQuote, QuoteRev, IdxQState, CodClientNew, CodItemNew, CodItemGroup, RawMat, UnitWeight, BatchQty, CodInco, Note, PriceOff, OrdDate, OrdNum, OrdRow, OrdPrice, valid, errorScore + FROM C2P.[dbo].[QuoteList] AS q + INNER JOIN [dbo].[TrascClient] AS tc ON q.CodClient = tc.CodClient + INNER JOIN dbo.TrascItem AS ti ON q.CodItem = ti.CodItem + + INSERT QuoteRM + SELECT QuoteType, CodQuote, QuoteRev, NumRM, RawMat, RawMatCost, RawMatExtraCost, CodPackag, FCR, valid + FROM C2P.[dbo].[QuoteRM] + + UPDATE QuoteList + SET CodClient = ( SELECT CodClientNew FROM TrascClient WHERE CodClient = '05000000382' ) + ,CodItem = ( SELECT CodItemNew FROM TrascItem WHERE CodItem = '3DI05376' ) + WHERE CodQuote = '1402050001' + + -- *** ESEGUO L'AGGIORNAMENTO **** + + DECLARE @QuoteType CHAR(1) = 'Q', + @CodQuote BIGINT = 1402050001, + @QuoteRev INT = 0, + @PriceOff DECIMAL(9, 6) = 0 + + -- EXEC stp_QL_update 'Q', 1402050001, 0 -- <<<<< ERRORE + -- EXECUTE dbo.stp_QuoteFull_Q_update 'Q', 1402050001, 0, 0.1 -- crea il record in QuoteFull_Q + + EXEC stp_QL_update @QuoteType, @CodQuote, @QuoteRev + SELECT @PriceOff = PriceOff FROM QuoteList WHERE CodQuote= @CodQuote AND QuoteRev = @QuoteRev + EXECUTE dbo.stp_QuoteFull_Q_update @QuoteType, @CodQuote, @QuoteRev -- crea il record in QuoteFull_Q + + SELECT * FROM QuoteList WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev + SELECT * FROM QuoteRM WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev + SELECT * FROM QuoteWorkInt WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev + SELECT * FROM QuoteWorkExt WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev + SELECT * FROM QuoteOC WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev + SELECT * FROM QuoteParam WHERE QuoteType=@QuoteType AND CodQuote = @CodQuote AND QuoteRev = @QuoteRev + + select top 10 * from ItemDet + + SELECT * FROM RawMatDet + + SELECT top 10 * FROM TabProdSc + SELECT top 10 * FROM TabDifett +-- SELECT * FROM TabImbArt +-- SELECT * FROM TabImbGrp + SELECT * FROM PackagDet + SELECT * FROM Package2 + + ---- test gestione selezione CodPackag corretto + --SELECT TOP 5 * FROM Package2ItemClient + --SELECT TOP 5 * FROM Package2Item + --SELECT TOP 5 * FROM Package2 + + -- SELECT dbo.f_getCodPackag('1EL00005', '05000001048') + --SELECT dbo.f_getCodPackag('1AN00001', '05000000137') + + +END +GO PRINT N'Creating [dbo].[QuoteOC].[MS_Description]...'; diff --git a/C2P_Report/bin/C2P_Data.dll b/C2P_Report/bin/C2P_Data.dll index 0170f6a..24a01fe 100644 Binary files a/C2P_Report/bin/C2P_Data.dll and b/C2P_Report/bin/C2P_Data.dll differ diff --git a/C2P_Report/bin/C2P_Report.dll b/C2P_Report/bin/C2P_Report.dll index 555c02f..3f0d8de 100644 Binary files a/C2P_Report/bin/C2P_Report.dll and b/C2P_Report/bin/C2P_Report.dll differ diff --git a/C2P_Report/bin/SteamWare.dll b/C2P_Report/bin/SteamWare.dll index 80634d4..3b7bb79 100644 Binary files a/C2P_Report/bin/SteamWare.dll and b/C2P_Report/bin/SteamWare.dll differ diff --git a/VersGen/C2P.cs b/VersGen/C2P.cs index f40183f..027fd73 100644 --- a/VersGen/C2P.cs +++ b/VersGen/C2P.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.150.353")] -[assembly: AssemblyFileVersion("2.0.150.353")] +[assembly: AssemblyVersion("2.1.151.353")] +[assembly: AssemblyFileVersion("2.1.151.353")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/C2P.tt b/VersGen/C2P.tt index 65342a2..b178f13 100644 --- a/VersGen/C2P.tt +++ b/VersGen/C2P.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.150.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.0.150.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.1.151.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.1.151.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Proxima & Steamware © 2013-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+