Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into ADM

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-03-09 12:35:10 +01:00
parent 6fc1c831ff b97f1da062
commit 42a6484136
5 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1401']) {
withEnv(['NEXT_BUILD_NUMBER=1402']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-MAG/WebUserControls/cmp_OrderListAdd.ascx.cs
+12 -4
View File
@@ -58,14 +58,22 @@ namespace MP_MAG.WebUserControls
{
// recupero dati...
string keySel = grView.SelectedValue.ToString();
int RigaOrd = 0;
int.TryParse(keySel, out RigaOrd);
var tabOrdExt = MagData.MagDataLayer.man.taEOL.getByKey(RigaOrd);
int numRigaOrd = 0;
int.TryParse(keySel, out numRigaOrd);
var tabOrdExt = MagData.MagDataLayer.man.taEOL.getByKey(numRigaOrd);
if (tabOrdExt != null && tabOrdExt.Count > 0)
{
var rigaOrd = tabOrdExt[0];
string descrOrd = $"Data: {rigaOrd.DataConsegna:yyyy/MM/dd} | Dest: {rigaOrd.DescDestinazione}";
MagData.MagDataLayer.man.taOList.insertQuery(PackListID, keySel, rigaOrd.CodArticolo, descrOrd, rigaOrd.Qta);
// verifico che per la packingList corrente no ci sia già l'ordine (sennò NON aggiungo...
var tabOrdiniCaricati = MagData.MagDataLayer.man.taOList.getByPLID(PackListID);
// cerco se ci sia il cod esterno
var ordiniCaricati = tabOrdiniCaricati.Where(x => x.ExtOrdCod == keySel);
if (ordiniCaricati.ToList().Count == 0)
{
MagData.MagDataLayer.man.taOList.insertQuery(PackListID, keySel, rigaOrd.CodArticolo, descrOrd, rigaOrd.Qta, rigaOrd.CodCliente, rigaOrd.DescDestinazione);
}
raiseAddNew();
}
}
MagData/DS_PackList.Designer.cs
Generated
+15 -1
View File
@@ -2830,6 +2830,8 @@ namespace MagData.DS_PackListTableAdapters {
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@OrdDescr", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Qty", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCliente", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodDestinazione", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[5].Connection = this.Connection;
this._commandCollection[5].CommandText = "dbo.stp_OrdList_updateQuery";
@@ -2935,7 +2937,7 @@ namespace MagData.DS_PackListTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int insertQuery(global::System.Nullable<int> PackListID, string ExtOrdCod, string CodArt, string OrdDescr, global::System.Nullable<int> Qty) {
public virtual int insertQuery(global::System.Nullable<int> PackListID, string ExtOrdCod, string CodArt, string OrdDescr, global::System.Nullable<int> Qty, string CodCliente, string CodDestinazione) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[4];
if ((PackListID.HasValue == true)) {
command.Parameters[1].Value = ((int)(PackListID.Value));
@@ -2967,6 +2969,18 @@ namespace MagData.DS_PackListTableAdapters {
else {
command.Parameters[5].Value = global::System.DBNull.Value;
}
if ((CodCliente == null)) {
command.Parameters[6].Value = global::System.DBNull.Value;
}
else {
command.Parameters[6].Value = ((string)(CodCliente));
}
if ((CodDestinazione == null)) {
command.Parameters[7].Value = global::System.DBNull.Value;
}
else {
command.Parameters[7].Value = ((string)(CodDestinazione));
}
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
MagData/DS_PackList.xsd
+5 -3
View File
@@ -169,6 +169,8 @@
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodArt" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@OrdDescr" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Qty" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodCliente" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodDestinazione" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -240,7 +242,7 @@
<xs:element name="DS_PackList" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_PackList" msprop:Generator_UserDSName="DS_PackList">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="PackList" msprop:Generator_TableClassName="PackListDataTable" msprop:Generator_TableVarName="tablePackList" msprop:Generator_RowChangedName="PackListRowChanged" msprop:Generator_TablePropName="PackList" msprop:Generator_RowDeletingName="PackListRowDeleting" msprop:Generator_RowChangingName="PackListRowChanging" msprop:Generator_RowEvHandlerName="PackListRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListRowDeleted" msprop:Generator_RowClassName="PackListRow" msprop:Generator_UserTableName="PackList" msprop:Generator_RowEvArgName="PackListRowChangeEvent">
<xs:element name="PackList" msprop:Generator_TableClassName="PackListDataTable" msprop:Generator_TableVarName="tablePackList" msprop:Generator_TablePropName="PackList" msprop:Generator_RowDeletingName="PackListRowDeleting" msprop:Generator_RowChangingName="PackListRowChanging" msprop:Generator_RowEvHandlerName="PackListRowChangeEventHandler" msprop:Generator_RowDeletedName="PackListRowDeleted" msprop:Generator_UserTableName="PackList" msprop:Generator_RowChangedName="PackListRowChanged" msprop:Generator_RowEvArgName="PackListRowChangeEvent" msprop:Generator_RowClassName="PackListRow">
<xs:complexType>
<xs:sequence>
<xs:element name="PackListID" msprop:Generator_ColumnVarNameInTable="columnPackListID" msprop:Generator_ColumnPropNameInRow="PackListID" msprop:Generator_ColumnPropNameInTable="PackListIDColumn" msprop:Generator_UserColumnName="PackListID" type="xs:int" />
@@ -279,7 +281,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="OrdersList" msprop:Generator_TableClassName="OrdersListDataTable" msprop:Generator_TableVarName="tableOrdersList" msprop:Generator_RowChangedName="OrdersListRowChanged" msprop:Generator_TablePropName="OrdersList" msprop:Generator_RowDeletingName="OrdersListRowDeleting" msprop:Generator_RowChangingName="OrdersListRowChanging" msprop:Generator_RowEvHandlerName="OrdersListRowChangeEventHandler" msprop:Generator_RowDeletedName="OrdersListRowDeleted" msprop:Generator_RowClassName="OrdersListRow" msprop:Generator_UserTableName="OrdersList" msprop:Generator_RowEvArgName="OrdersListRowChangeEvent">
<xs:element name="OrdersList" msprop:Generator_TableClassName="OrdersListDataTable" msprop:Generator_TableVarName="tableOrdersList" msprop:Generator_TablePropName="OrdersList" msprop:Generator_RowDeletingName="OrdersListRowDeleting" msprop:Generator_RowChangingName="OrdersListRowChanging" msprop:Generator_RowEvHandlerName="OrdersListRowChangeEventHandler" msprop:Generator_RowDeletedName="OrdersListRowDeleted" msprop:Generator_UserTableName="OrdersList" msprop:Generator_RowChangedName="OrdersListRowChanged" msprop:Generator_RowEvArgName="OrdersListRowChangeEvent" msprop:Generator_RowClassName="OrdersListRow">
<xs:complexType>
<xs:sequence>
<xs:element name="OrderListID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnOrderListID" msprop:Generator_ColumnPropNameInRow="OrderListID" msprop:Generator_ColumnPropNameInTable="OrderListIDColumn" msprop:Generator_UserColumnName="OrderListID" type="xs:int" />
@@ -318,7 +320,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="ExtOrdersList" msprop:Generator_TableClassName="ExtOrdersListDataTable" msprop:Generator_TableVarName="tableExtOrdersList" msprop:Generator_RowChangedName="ExtOrdersListRowChanged" msprop:Generator_TablePropName="ExtOrdersList" msprop:Generator_RowDeletingName="ExtOrdersListRowDeleting" msprop:Generator_RowChangingName="ExtOrdersListRowChanging" msprop:Generator_RowEvHandlerName="ExtOrdersListRowChangeEventHandler" msprop:Generator_RowDeletedName="ExtOrdersListRowDeleted" msprop:Generator_RowClassName="ExtOrdersListRow" msprop:Generator_UserTableName="ExtOrdersList" msprop:Generator_RowEvArgName="ExtOrdersListRowChangeEvent">
<xs:element name="ExtOrdersList" msprop:Generator_TableClassName="ExtOrdersListDataTable" msprop:Generator_TableVarName="tableExtOrdersList" msprop:Generator_TablePropName="ExtOrdersList" msprop:Generator_RowDeletingName="ExtOrdersListRowDeleting" msprop:Generator_RowChangingName="ExtOrdersListRowChanging" msprop:Generator_RowEvHandlerName="ExtOrdersListRowChangeEventHandler" msprop:Generator_RowDeletedName="ExtOrdersListRowDeleted" msprop:Generator_UserTableName="ExtOrdersList" msprop:Generator_RowChangedName="ExtOrdersListRowChanged" msprop:Generator_RowEvArgName="ExtOrdersListRowChangeEvent" msprop:Generator_RowClassName="ExtOrdersListRow">
<xs:complexType>
<xs:sequence>
<xs:element name="RigaOrd" msprop:Generator_ColumnVarNameInTable="columnRigaOrd" msprop:Generator_ColumnPropNameInRow="RigaOrd" msprop:Generator_ColumnPropNameInTable="RigaOrdColumn" msprop:Generator_UserColumnName="RigaOrd" type="xs:int" />
MagData/DS_PackList.xss
+2 -2
View File
@@ -7,8 +7,8 @@
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:PackList" ZOrder="3" X="443" Y="59" Height="324" Width="258" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:OrdersList" ZOrder="2" X="76" Y="83" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:ExtOrdersList" ZOrder="1" X="738" Y="53" Height="362" Width="222" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:OrdersList" ZOrder="1" X="76" Y="83" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:ExtOrdersList" ZOrder="2" X="738" Y="53" Height="324" Width="222" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
</Shapes>
<Connectors />
</DiagramLayout>