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

update cartellino finiti

Browse Source 
modifica creazione record trattato
This commit is contained in:
Samuele Locatelli
2014-02-14 15:04:41 +01:00
parent 9373eef829
commit afdfd0ce85
12 changed files with 1779 additions and 2708 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW.csproj
+3 -3
View File
@@ -1181,9 +1181,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Reports\CartellinoFiniti.rdlc">
<SubType>Designer</SubType>
</Content>
<Content Include="Reports\CartellinoMP.rdlc" />
<Content Include="Reports\CartellinoOdette.rdlc">
<SubType>Designer</SubType>
@@ -1543,6 +1540,9 @@
<Content Include="Reports\CartellinoSterrati.rdlc" />
<Content Include="Reports\CartellinoTrattati.rdlc" />
</ItemGroup>
<ItemGroup>
<Content Include="Reports\CartellinoFiniti.rdlc" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
GMW/GMW.csproj.user
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectView>ProjectFiles</ProjectView>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>218</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>
GMW/Reports/CartellinoFiniti.rdlc
+876 -1343
View File
File diff suppressed because it is too large Load Diff
GMW/Reports/TK/CartellinoFiniti.rdlc
+876 -1343
View File
File diff suppressed because it is too large Load Diff
GMW/Web.config
+1 -1
View File
@@ -66,7 +66,7 @@
<add key="appName" value="GMW" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="2.4" />
<add key="minRev" value="595" />
<add key="minRev" value="596" />
<add key="copyRight" value="SteamWare © 2010" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/WebUserControls/mod_anime.ascx.cs
+5 -5
View File
@@ -177,11 +177,11 @@ namespace GMW.WebUserControls
{
postazione_printer = tabPost[0].stampante;
}
//else
//{
// tabPost = DataProxy.obj.taElPost.getByCod("default");
// postazione_printer = tabPost[0].stampante;
//}
else
{
tabPost = DataProxy.obj.taElPost.getByCod("default");
postazione_printer = tabPost[0].stampante;
}
}
catch
{ }
GMW/WebUserControls/mod_fusiTK.ascx.cs
+5 -5
View File
@@ -177,11 +177,11 @@ namespace GMW.WebUserControls
{
postazione_printer = tabPost[0].stampante;
}
//else
//{
// tabPost = DataProxy.obj.taElPost.getByCod("default");
// postazione_printer = tabPost[0].stampante;
//}
else
{
tabPost = DataProxy.obj.taElPost.getByCod("default");
postazione_printer = tabPost[0].stampante;
}
}
catch
{ }
GMW/WebUserControls/mod_trattamenti.ascx
+1 -1
View File
@@ -67,7 +67,7 @@
</div>
<div class="clearDiv" style="padding: 2px;">
<div style="float: left;">
<asp:ListBox ID="lbTrattamenti" runat="server" Height="140px" Width="166px" Font-Size="20pt" TabIndex="10" />
<asp:ListBox ID="lbTrattamenti" runat="server" Height="56px" Width="166px" Font-Size="20pt" TabIndex="10" />
</div>
<div style="float: right;">
<asp:Button runat="server" ID="btnSvuota" Height="56px" Width="40px" Font-Size="20pt" Text="-" OnClick="btnSvuota_Click" TabIndex="8" />
GMW/WebUserControls/mod_trattamenti.ascx.cs
+11 -6
View File
@@ -30,11 +30,11 @@ namespace GMW.WebUserControls
/// attributo per TRATTAMENTO termico
/// </summary>
protected string attrNumTra = "NT";
#if false
/// <summary>
/// flusso associato (hard coded) al TRATTAMENTO termico
/// </summary>
protected string flusso_TR = "TR";
#if false
/// <summary>
/// tipo di evento associato alla creazione dell'UDC di trattamento termico
/// </summary>
@@ -423,11 +423,15 @@ namespace GMW.WebUserControls
{
if (MagClass.magazzino.CodStatoUdc(barcodeIn) == statoUDC_pre)
{
// 2014.02.14 non permetto + di 1 UDC: svuoto elenco!
elencoUDC.Clear();
// se è ok aggiungo in elenco UDC e mostro udpate
checkUdc4elenco(barcodeIn);
// seleziono anche particolare corrente
currParticolare = DataProxy.obj.taCartellini.stp_getByUdc(barcodeIn)[0].Particolare;
fixNumPezzi();
txtQta.Text = DataProxy.obj.taCartellini.stp_getByUdc(barcodeIn)[0].Qta.ToString();
// 2014.02.14: non imposto + ultima qta perché ho preso da UDC sorgente
//fixNumPezzi();
pnlAll.CssClass = "stileComandoOk";
}
else
@@ -546,7 +550,7 @@ namespace GMW.WebUserControls
if (partDistintaOk)
{
string newUdcChild = "";
//string newUdcParent = "";
string newUdcParent = "";
//bool UdcExists = false;
int anno = Convert.ToInt32(txtAnno.Text.Substring(txtAnno.Text.Trim().Length - 2, 2));
int qta = memLayer.ML.confReadInt("QtaImballoTratt");
@@ -599,8 +603,7 @@ namespace GMW.WebUserControls
{
// versione vecchia con creazione UDC di trattamento e relazione...
#if false
// calcolo il nuovo codice UDC del trattamento
newUdcParent = MagClass.magazzino.getComposizioneUDC(memLayer.ML.confReadString("CodCS"), flusso_TR, anno.ToString(), Convert.ToInt32(kvp.Key));
// verifico se ci sia già UDC
UdcExists = MagClass.magazzino.checkUDC(newUdcParent);
if (!UdcExists)
@@ -626,8 +629,10 @@ namespace GMW.WebUserControls
newUdcParent = "";
UdcExists = false;
#endif
// calcolo il nuovo codice UDC del trattamento
newUdcParent = MagClass.magazzino.getComposizioneUDC(memLayer.ML.confReadString("CodCS"), flusso_TR, anno.ToString(), Convert.ToInt32(kvp.Key));
// inserisco attributo trattamento
MagClass.magazzino.taAtt2UDC.Insert(newUdcChild, attrNumTra, kvp.Key);
MagClass.magazzino.taAtt2UDC.Insert(newUdcChild, attrNumTra, newUdcParent);
}
// ora stampo il nuovo cartellino!!!
MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartTratt, Request.UserHostName);
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
ReleaseClienti/TK_prod/GMW.zip
BIN
View File
Binary file not shown.
ReleaseClienti/TK_test/GMW.zip
BIN
View File
Binary file not shown.