Update installers

update sql 
terminalino e web vanno x gestione spostamenti in magazzino 

git-svn-id: https://keyhammer.ath.cx/svn/GMW/trunk@441 365432ac-a1b5-4ffd-bb28-6d3099d32164
This commit is contained in:
samuele
2012-03-12 18:25:34 +00:00
parent b743baf0db
commit 22d2e8bc83
35 changed files with 431 additions and 28 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+2
View File
@@ -123,6 +123,8 @@
<add key ="LdpSmartTipoLDP" value="00-Smart" />
<add key ="LdpSmartDest" value="C001" />
<add key ="LdpSmartCella" value="LPX010101" />
<!--posizione per UDC spostati da cella mag vuota che risultasse piena da db-->
<add key="codCellaErroriAnime" value="S00010101" />
<!--Setup installazione-->
<add key="passkey" value="pi=314" />
<add key="CodCS" value="TK" />
@@ -1 +1,51 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_makeMov.ascx.cs" Inherits="GMW_Term.WebUserControls.mod_makeMov" %>
<div style="font-size: normal">
<div>
<div style="float: left;">
<asp:Label runat="server" ID="lblCella" />
<br />
<b>
<asp:Label runat="server" ID="lblCodCella" />
</b>
</div>
<div style="float: right;">
<asp:Label runat="server" ID="lblUDC" />
<br />
<b>
<asp:Label runat="server" ID="lblCodUDC" />
</b>
</div>
</div>
<div id="cl1" class="clearAll">
</div>
<div>
<div class="errore" style="color: Red;">
<asp:Label runat="server" ID="lblErrore" />
</div>
</div>
<div>
<div style="color: Green;">
<asp:Label runat="server" ID="lblEsito" />
</div>
</div>
<div id="Div3" class="clearAll">
</div>
<div>
<div style="float: left;">
<asp:LinkButton ID="btnConferma" runat="server" OnClick="btnConferma_Click"
CssClass="styleBtnComposito" Height="30">
<img src="images/new_m.png" style="border-style: none; margin-right: 0.2em;" width="13px"
height="13px" />
<asp:Label ID="lblGeneraListe" runat="server" />
</asp:LinkButton>
</div>
<div style="float: right;">
<asp:LinkButton ID="btnAnnulla" runat="server" OnClick="btnAnnulla_Click" CssClass="styleBtnComposito"
Height="30">
<img src="images/cancel_m.png" style="border-style: none; margin-right: 0.2em;" width="13px"
height="13px" />
<asp:Label ID="lblResetListe" runat="server" />
</asp:LinkButton>
</div>
</div>
</div>
@@ -4,14 +4,124 @@ using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using SteamWare;
using GMW_data;
namespace GMW_Term.WebUserControls
{
public partial class mod_makeMov : System.Web.UI.UserControl
{
/// <summary>
/// wrapper traduzione termini
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduci(string lemma)
{
return user_std.UtSn.Traduci(lemma);
}
/// <summary>
/// chiamata principale
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void Page_Load(object sender, EventArgs e)
{
updateMakeMov();
}
/// <summary>
/// aggiorna lo stato dell'operazione di movimentazione
/// </summary>
public void updateMakeMov()
{
// recupero barcode e controllo sia valido
string _UDC = memLayer.ML.StringSessionObj("UDC_sel");
int _idxCella = memLayer.ML.IntSessionObj("IdxCella_sel");
string _codCella = memLayer.ML.StringSessionObj("codCella_sel");
// aggiorno labels standard
lblCella.Text = traduci("lblCella");
lblUDC.Text = traduci("lblUDC");
btnConferma.Text = traduci("btnConferma");
btnAnnulla.Text = traduci("btnAnnulla");
// aggiorno labels valori
lblCodCella.Text = _codCella;
lblCodUDC.Text = _UDC;
// controllo se ci siano UDC/Cella validi
if (_UDC != "" && _codCella != "")
{
// SE cella vuota procedo!
if (!MagClass.magazzino.cellaPiena(memLayer.ML.confReadString("codCS"), _idxCella))
{
spostaUdc(_UDC, _idxCella, _codCella);
}
else
{
// se cella piena chiedo conferma
btnConferma.Visible = true;
btnAnnulla.Visible = true;
}
}
else
{
btnConferma.Visible = false;
btnAnnulla.Visible = false;
}
}
/// <summary>
/// effettua spostamento UDC sparato da barcode
/// </summary>
/// <param name="_UDC"></param>
/// <param name="_idxCella"></param>
/// <param name="_codCella"></param>
private void spostaUdc(string _UDC, int _idxCella, string _codCella)
{
MagClass.magazzino.spostaUDC(memLayer.ML.confReadString("codCS"), _UDC, _idxCella, false);
btnConferma.Visible = false;
btnAnnulla.Visible = false;
lblEsito.Text = string.Format("{0} {1} --> {2} ", traduci("ConfermaSpostatoUDC"), _UDC, _codCella);
resetAndUpdate();
}
/// <summary>
/// CONFERMA associazione UDC/CELLA
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnConferma_Click(object sender, EventArgs e)
{
// calcolo valori
string _UDC = memLayer.ML.StringSessionObj("UDC_sel");
int _idxCella = memLayer.ML.IntSessionObj("IdxCella_sel");
string _codCella = memLayer.ML.StringSessionObj("codCella_sel");
// sposto UDC precedente in posizione preimpostata da web.config
string codCellaErroriAnime = memLayer.ML.confReadString("codCellaErroriAnime");
int idxCellaTo = MagClass.magazzino.taCelle.getByCodCella(codCellaErroriAnime)[0].IdxCella;
string udc2move = MagClass.magazzino.udcInCella(memLayer.ML.confReadString("codCS"), _idxCella);
MagClass.magazzino.spostaUDC(memLayer.ML.confReadString("codCS"), udc2move, idxCellaTo, false);
lblEsito.Text = string.Format("{0} {1} --> {2} ", traduci("ConfermaSpostatoUDC"), _UDC, _codCella);
spostaUdc(_UDC, _idxCella, _codCella);
resetAndUpdate();
}
/// <summary>
/// aggiorna visualizzazioni e resetta
/// </summary>
private void resetAndUpdate()
{
memLayer.ML.emptySessionVal("UDC_sel");
memLayer.ML.emptySessionVal("IdxCella_sel");
memLayer.ML.emptySessionVal("codCella_sel");
// aggiorno visualizzazione
updateMakeMov();
lblErrore.Visible = false;
}
/// <summary>
/// annulla associazione UDC / CELLA
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnAnnulla_Click(object sender, EventArgs e)
{
resetAndUpdate();
}
}
}
+95 -7
View File
@@ -1,18 +1,106 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Runtime Version:2.0.50727.42
// Runtime Version:2.0.50727.4963
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace GMW_Term.WebUserControls
{
public partial class mod_makeMov
{
namespace GMW_Term.WebUserControls {
public partial class mod_makeMov {
/// <summary>
/// lblCella control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCella;
/// <summary>
/// lblCodCella control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCodCella;
/// <summary>
/// lblUDC control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblUDC;
/// <summary>
/// lblCodUDC control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblCodUDC;
/// <summary>
/// lblErrore control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblErrore;
/// <summary>
/// lblEsito control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblEsito;
/// <summary>
/// btnConferma control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton btnConferma;
/// <summary>
/// lblGeneraListe control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblGeneraListe;
/// <summary>
/// btnAnnulla control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton btnAnnulla;
/// <summary>
/// lblResetListe control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblResetListe;
}
}
@@ -11,7 +11,6 @@ namespace GMW_Term.WebUserControls
{
public partial class mod_smartList : System.Web.UI.UserControl
{
/// <summary>
/// wrapper traduzione termini
/// </summary>
@@ -178,11 +177,4 @@ namespace GMW_Term.WebUserControls
}
}
/*
* RIFARE
* - gestione LDP temporanee...
* + vanno create e devono poter essere cancellate da sito (elenco di quelle aperte)
* */
}
Binary file not shown.
Binary file not shown.
+14 -1
View File
@@ -11,7 +11,20 @@ namespace GMW_Term
{
protected void Page_Load(object sender, EventArgs e)
{
// imposto valori visibilità barcode specifici (nascondo testo...)
mod_barcode1.showHeaderText = true;
mod_barcode1.showNoteText = true;
// imposto controllo valori scansionati
mod_barcode1.eh_scannedUdc += new EventHandler(mod_barcode1_eh_scannedUdc);
mod_barcode1.eh_scannedCella += new EventHandler(mod_barcode1_eh_scannedCella);
}
void mod_barcode1_eh_scannedCella(object sender, EventArgs e)
{
Response.Redirect("~/makeMov.aspx");
}
void mod_barcode1_eh_scannedUdc(object sender, EventArgs e)
{
Response.Redirect("~/makeMov.aspx");
}
}
}
+2 -2
View File
@@ -54,11 +54,9 @@
<!--Configurazioni ad hoc Tekal-->
<add key="Cosumo84PostDelibera" value="true" />
<add key="riattUdcPermessa" value="true" />
<!--Setup periodo controlli date-->
<add key="defDayFrom" value="-60" />
<add key="mostraSelOra" value="false" />
<!--Setup codici postazioni-->
<add key="IdxPosizMP" value="66" />
<add key="IdxPosNewFusi" value="77" />
@@ -74,6 +72,8 @@
<add key="LdpSmartTipoLDP" value="00-Smart" />
<add key="LdpSmartDest" value="C001" />
<add key="LdpSmartCella" value="LPX010101" />
<!--posizione per UDC spostati da cella mag vuota che risultasse piena da db-->
<add key="codCellaErroriAnime" value="S00010101" />
<!--Setup installazione-->
<add key="passkey" value="pi=314" />
<add key="CodCS" value="TK" />
+4
View File
@@ -20,6 +20,7 @@
<add key="_logMaxMb" value="30" />
<add key="intUpdatePagina_ms" value="120000" />
<add key="_righeDataGrid" value="30" />
<add key="_righeDataGridAnagr" value="30" />
<add key="_righeDataGridLong" value="40" />
<add key="_righeDataGridMed" value="20" />
<add key="_righeDataGridShort" value="10" />
@@ -42,6 +43,7 @@
<add key="BilanciaMP" value="MP" />
<add key="CodImballoMP" value="" />
<add key="CodStatoMP" value="MP" />
<add key="CodImballoAnime" value="AI00" />
<add key="numGgToReloadRQ" value="30" />
<!--Setup urls stampa reports-->
<add key="urlReporting" value="http://{0}/ReportServer?/{1}/{2}&amp;rs:Command=Render&amp;rc:Parameters=true&amp;rc:Toolbar=true&amp;CodListaPrel={3}{4}" />
@@ -70,6 +72,8 @@
<add key ="LdpSmartTipoLDP" value="00-Smart" />
<add key ="LdpSmartDest" value="C001" />
<add key ="LdpSmartCella" value="LPX010101" />
<!--posizione per UDC spostati da cella mag vuota che risultasse piena da db-->
<add key="codCellaErroriAnime" value="S00010101" />
<!--Setup installazione-->
<add key="passkey" value="pi=314" />
<add key="CodCS" value="SP" />
+3
View File
@@ -43,6 +43,7 @@
<add key="BilanciaMP" value="MP" />
<add key="CodImballoMP" value="" />
<add key="CodStatoMP" value="MP" />
<add key="CodImballoAnime" value="AI00" />
<add key="numGgToReloadRQ" value="30" />
<!--Setup urls stampa reports-->
<add key="urlReporting" value="http://{0}/ReportServer?/{1}/{2}&amp;rs:Command=Render&amp;rc:Parameters=true&amp;rc:Toolbar=true&amp;CodListaPrel={3}{4}" />
@@ -71,6 +72,8 @@
<add key ="LdpSmartTipoLDP" value="00-Smart" />
<add key ="LdpSmartDest" value="C001" />
<add key ="LdpSmartCella" value="LPX010101" />
<!--posizione per UDC spostati da cella mag vuota che risultasse piena da db-->
<add key="codCellaErroriAnime" value="S00010101" />
<!--Setup installazione-->
<add key="passkey" value="pi=314" />
<add key="CodCS" value="TK" />
+2 -2
View File
@@ -54,11 +54,9 @@
<!--Configurazioni ad hoc Tekal-->
<add key="Cosumo84PostDelibera" value="true" />
<add key="riattUdcPermessa" value="true" />
<!--Setup periodo controlli date-->
<add key="defDayFrom" value="-60" />
<add key="mostraSelOra" value="false" />
<!--Setup codici postazioni-->
<add key="IdxPosizMP" value="66" />
<add key="IdxPosNewFusi" value="77" />
@@ -74,6 +72,8 @@
<add key="LdpSmartTipoLDP" value="00-Smart" />
<add key="LdpSmartDest" value="C001" />
<add key="LdpSmartCella" value="LPX010101" />
<!--posizione per UDC spostati da cella mag vuota che risultasse piena da db-->
<add key="codCellaErroriAnime" value="S00010101" />
<!--Setup installazione-->
<add key="passkey" value="pi=314" />
<add key="CodCS" value="TK" />
Binary file not shown.
@@ -344,14 +344,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMWT"
"ProductCode" = "8:{393246EB-9764-4C35-82D7-A8138F15F4D0}"
"PackageCode" = "8:{E29237BF-E721-41FC-A133-80063888E914}"
"ProductCode" = "8:{FA3C0ABA-85AA-4657-8986-F628BBD906C8}"
"PackageCode" = "8:{5B95E951-C332-450D-9217-A74ED78E85A6}"
"UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.425"
"ProductVersion" = "8:1.1.426"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"
+2
View File
@@ -271,6 +271,7 @@
<None Include="SqlScripts\V1.1\GMW_00225.sql" />
<None Include="SqlScripts\V1.1\GMW_00230.sql" />
<None Include="SqlScripts\V1.1\GMW_00360.sql" />
<None Include="SqlScripts\V1.2\GMW_00426.sql" />
<None Include="SqlScripts\V1.2\GMW_00425.sql" />
<None Include="SqlScripts\V1.2\GMW_00414.sql" />
<None Include="SqlScripts\V1.2\GMW_410_TEKAL\01-Da TK_GMWTEst 395 a 409 TABELLE.sql" />
@@ -285,6 +286,7 @@
<None Include="SqlScripts\V1.2\GMW_00402.sql" />
<None Include="SqlScripts\V1.2\GMW_00401.sql" />
<None Include="SqlScripts\V1.2\GMW_410_TEKAL\SincVocabolario_TK_409.sql" />
<None Include="SqlScripts\Vocabolario\vocab_426.sql" />
<None Include="SqlScripts\Vocabolario\vocab_425.sql" />
<None Include="SqlScripts\Vocabolario\vocab_409.sql" />
<None Include="SqlScripts\Vocabolario\vocab_401.sql" />
+17
View File
@@ -775,6 +775,23 @@ namespace GMW_data
return answ;
}
/// <summary>
/// restituisce cod UDC associato ad una cella
/// </summary>
/// <param name="CodCS">Codice company/sito</param>
/// <param name="IdxCella"></param>
/// <returns></returns>
public string udcInCella(string CodCS, int IdxCella)
{
string answ = "";
try
{
answ = taPosUdcCorr.getByIdxCella(IdxCella)[0].UDC;
}
catch
{ }
return answ;
}
/// <summary>
/// verifica la cella indicata sia valida, ovvero esistente
/// </summary>
/// <param name="CodCella"></param>
@@ -0,0 +1,71 @@
set xact_abort on
go
begin transaction
go
set identity_insert dbo.Blocchi on
go
INSERT INTO dbo.Blocchi
(IdxBlocco, CodMag, CodCS, CodBlocco, DescBlocco, NumX, NumY, NumZ)
VALUES (62, N'2', N'TK', N'S00', N'Anime - errori magazzino', 1, 1, 1)
go
set identity_insert dbo.Blocchi off
go
commit transaction
go
set xact_abort on
go
begin transaction
go
set identity_insert dbo.TipoCella on
go
INSERT INTO dbo.TipoCella
(IdxTipoCella, CodMag, CodCS, Quantita, Capienza, Max_X, Max_Y, Max_Z, Max_Kg, CheckPiena, SetMag)
VALUES (27, N'2', N'TK', 1, 1000, 850, 900, 1300, 1000, 0, 0)
go
set identity_insert dbo.TipoCella off
go
commit transaction
go
set xact_abort on
go
begin transaction
go
set identity_insert dbo.Celle on
go
INSERT INTO dbo.Celle
(IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxBlocco, X, Y, Z)
VALUES (6198, N'TK', N'LPA010101', 13, N'-', 1, 0, 59, 1, 1, 1)
INSERT INTO dbo.Celle
(IdxCella, CodCS, CodCella, IdxTipoCella, Descrizione, Attiva, Piena, IdxBlocco, X, Y, Z)
VALUES (6199, N'TK', N'S00010101', 27, N'-', 1, 0, 62, 1, 1, 1)
go
set identity_insert dbo.Celle off
go
commit transaction
go
-- registro versione...
INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(426, GETDATE())
GO
@@ -0,0 +1,51 @@
set xact_abort on
go
begin transaction
go
UPDATE dbo.Vocabolario SET
Traduzione=N'Codice non riconosciuto'
WHERE Lingua=N'EN' and Lemma=N'BarcodeNonValidoLDP'
INSERT INTO dbo.Vocabolario
VALUES (N'EN', N'btnConferma', N'Conferma')
INSERT INTO dbo.Vocabolario
VALUES (N'EN', N'ConfermaSpostatoUDC', N'Conferma: spostato UDC')
UPDATE dbo.Vocabolario SET
Traduzione=N'Creaz F18'
WHERE Lingua=N'EN' and Lemma=N'CreazF18'
INSERT INTO dbo.Vocabolario
VALUES (N'EN', N'lblCella', N'CodCella')
INSERT INTO dbo.Vocabolario
VALUES (N'EN', N'lblUDC', N'UDC')
UPDATE dbo.Vocabolario SET
Traduzione=N'Postazione Liquidi'
WHERE Lingua=N'EN' and Lemma=N'PostLiquidi'
UPDATE dbo.Vocabolario SET
Traduzione=N'Codice non riconosciuto'
WHERE Lingua=N'IT' and Lemma=N'BarcodeNonValidoLDP'
INSERT INTO dbo.Vocabolario
VALUES (N'IT', N'btnConferma', N'Conferma')
INSERT INTO dbo.Vocabolario
VALUES (N'IT', N'ConfermaSpostatoUDC', N'Conferma: spostato UDC')
UPDATE dbo.Vocabolario SET
Traduzione=N'Creaz F18'
WHERE Lingua=N'IT' and Lemma=N'CreazF18'
INSERT INTO dbo.Vocabolario
VALUES (N'IT', N'lblCella', N'CodCella')
INSERT INTO dbo.Vocabolario
VALUES (N'IT', N'lblUDC', N'UDC')
UPDATE dbo.Vocabolario SET
Traduzione=N'Postazione Liquidi'
WHERE Lingua=N'IT' and Lemma=N'PostLiquidi'
go
commit transaction
go
-- registro versione...
INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(426, GETDATE())
GO
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1 -1
View File
@@ -307,7 +307,7 @@
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW"
"ProductCode" = "8:{FC1F8B43-87CB-46E0-A0F8-E8340418AE0F}"
"PackageCode" = "8:{A9F60597-8E35-46CF-B977-4835FC3DD76F}"
"PackageCode" = "8:{ADC688D8-DF87-421A-B41B-0407AC137271}"
"UpgradeCode" = "8:{C9BC0732-DC92-4336-BAC9-A05A5D2A97C0}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
Binary file not shown.
@@ -301,14 +301,14 @@
{
"Name" = "8:Microsoft Visual Studio"
"ProductName" = "8:GMW_test"
"ProductCode" = "8:{18908B8C-591C-4A2F-9BDE-65CD5F96E1C7}"
"PackageCode" = "8:{FFDF3564-57D5-40ED-AB27-0E737E3E1601}"
"ProductCode" = "8:{B2CB0FAC-4475-48F8-8881-A0B82EF5456C}"
"PackageCode" = "8:{1D1C061C-BA9B-4E2C-A74A-3B3CBE0C783A}"
"UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}"
"RestartWWWService" = "11:TRUE"
"RemovePreviousVersions" = "11:TRUE"
"DetectNewerInstalledVersion" = "11:TRUE"
"InstallAllUsers" = "11:FALSE"
"ProductVersion" = "8:1.1.425"
"ProductVersion" = "8:1.1.426"
"Manufacturer" = "8:SteamWare s.r.l."
"ARPHELPTELEPHONE" = "8:+39-035460560"
"ARPHELPLINK" = "8:http://www.steamware.net"