Skip to content

B
business-java
Commit 6fec68ec authored by ppatro's avatar ppatro
Browse files
Options

Changed By Pragyan Parcel Picking /LTL to Master & Parcel covert 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92751 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 5128d205
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2728 additions and 8736 deletions
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationIC.java
View file @ 6fec68ec
......@@ -644,6 +644,10 @@ etc
String masterPackAllow = "";
String activePickAllow = "";
String stockToDockAllow = "";
String parcelPackAllow = "";
String directPickLoc = "";
//Changed By Pragyan 25/feb/13 To change the validation with ship type
String shipType = "";
String custCode = "";
//Changed by sumit on 03/10/12
String printer = "";
......@@ -761,6 +765,7 @@ etc
else if ( "master_pack_allow".equalsIgnoreCase( childNodeName ) )
{
masterPackAllow = checkNull(genericUtility.getColumnValue( "master_pack_allow", currFormDataDom ));
parcelPackAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
custCode = genericUtility.getColumnValue( "cust_code__from", currFormDataDom );
if(masterPackAllow.trim().length() > 0 )
{
......@@ -779,6 +784,13 @@ etc
//errFields.add( "" );
}
}
if("Y".equalsIgnoreCase(parcelPackAllow) && "Y".equalsIgnoreCase(masterPackAllow))
{
errFields.add( childNodeName.toLowerCase() );
errList.add( "ONSELCMP" );
}
if( rs != null )
{
rs.close();
......@@ -791,6 +803,107 @@ etc
}
}
}
//Changed By Pragyan 25/feb/13 To change the validation with ship type.start
else if ( "parcelpack_allow".equalsIgnoreCase( childNodeName ) )
{
parcelPackAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
custCode = genericUtility.getColumnValue( "cust_code__from", currFormDataDom );
if(parcelPackAllow.trim().length() > 0 )
{
sql = "SELECT C.SINGLE_LOT, W.MASTER_PACK_ALLOW, W.ACTIVE_PICK_ALLOW, W.STOCK_TO_DOCK_ALLOW, W.PARCELPACK_ALLOW " +
"FROM CUSTOMER C, WAVE_TYPE W WHERE C.WAVE_TYPE = W.WAVE_TYPE AND C.CUST_CODE = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, custCode);
rs = pstmt.executeQuery();
if( rs.next())
{
if( !parcelPackAllow.equalsIgnoreCase(rs.getString("PARCELPACK_ALLOW")))
{
//errList.add( "STOCK2DOC" );
errFields.add( childNodeName.toLowerCase() );
errList.add( "CHSINGLELT" );
//errFields.add( "" );
}
}
if("Y".equalsIgnoreCase(parcelPackAllow) && "Y".equalsIgnoreCase(masterPackAllow))
{
errFields.add( childNodeName.toLowerCase() );
errList.add( "ONSELCMP" );
}
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
}
}
//Changed By Pragyan 25/feb/13 To change the validation with ship type.end
else if ( "ship_type".equalsIgnoreCase( childNodeName ) )
{
masterPackAllow = checkNull(genericUtility.getColumnValue( "master_pack_allow", currFormDataDom ));
parcelPackAllow = checkNull(genericUtility.getColumnValue( "parcelpack_allow", currFormDataDom ));
shipType = checkNull(genericUtility.getColumnValue( "ship_type", currFormDataDom ));
if(("Y".equalsIgnoreCase(masterPackAllow)) && !("A".equalsIgnoreCase(shipType) || "M".equalsIgnoreCase(shipType)))
{
errFields.add( childNodeName.toLowerCase() );
errList.add( "ATLSTSELMP" );
}
else if(("Y".equalsIgnoreCase(parcelPackAllow)) && !("A".equalsIgnoreCase(shipType) || "P".equalsIgnoreCase(shipType)))
{
errFields.add( childNodeName.toLowerCase() );
errList.add( "ATLSTSELPP" );
}
else if(!("Y".equalsIgnoreCase(parcelPackAllow) || "Y".equalsIgnoreCase(masterPackAllow) ) && ("M".equalsIgnoreCase(shipType) || "P".equalsIgnoreCase(shipType)))
{
errFields.add( childNodeName.toLowerCase() );
errList.add( "ATLSTSENAN" );
}
}//directPickLoc
else if ( "direct_pick_loc".equalsIgnoreCase( childNodeName ) )
{
directPickLoc = checkNull(genericUtility.getColumnValue( "direct_pick_loc", currFormDataDom ));
int countLoc = 0;
if(directPickLoc.trim().length() > 0 )
{
sql = "SELECT COUNT(*) FROM LOCATION WHERE LOC_CODE= ? AND DIRECT_PICK = ?" ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, directPickLoc);
pstmt.setString(2, "Y");
rs = pstmt.executeQuery();
if( rs.next())
{
countLoc = rs.getInt(1);
if( !(countLoc > 0))
{
//errList.add( "STOCK2DOC" );
errFields.add( childNodeName.toLowerCase() );
errList.add( "INVDPIKLOC" );
//errFields.add( "" );
}
}
if( rs != null )
{
rs.close();
rs = null;
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
}
}
//Changed by sumit on 03/10/12 validating printer service name with existing printer in system start.
else if ( "active_pick_allow".equalsIgnoreCase( childNodeName ) )
{
activePickAllow = checkNull(genericUtility.getColumnValue( "active_pick_allow", currFormDataDom ));
......
webitm-wms/module-resource/metadata/wavegen12.xml
View file @ 6fec68ec
......@@ -480,6 +480,34 @@
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Active Pick</text>
<border>6</border>
<color>33554432</color>
<x>793</x>
<y>2</y>
<height>16</height>
<width>71</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>active_pick_allow_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
......@@ -508,6 +536,34 @@
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Parce Pack Allow</text>
<border>6</border>
<color>33554432</color>
<x>953</x>
<y>2</y>
<height>16</height>
<width>98</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>parcelpack_allow_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>1</alignment>
......@@ -1338,6 +1394,42 @@
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>12</id>
<alignment>0</alignment>
<tabsequence>50</tabsequence>
<border>0</border>
<color>33554432</color>
<x>953</x>
<y>2</y>
<height>15</height>
<width>98</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>parcelpack_allow</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>13</id>
......@@ -1963,98 +2055,6 @@
<color>16777215</color>
</background>
</ColumnObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Active Pick</text>
<border>6</border>
<color>33554432</color>
<x>793</x>
<y>2</y>
<height>16</height>
<width>71</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>active_pick_allow_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>0</alignment>
<text>Parcel Pick Allow</text>
<border>6</border>
<color>33554432</color>
<x>953</x>
<y>2</y>
<height>16</height>
<width>98</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>parcelpack_allow_t</name>
<visible>1</visible>
<font>
<face>Times New Roman</face>
<height>-10</height>
<weight>400</weight>
<family>1</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>67108864</color>
</background>
</TextObject>
<ColumnObject>
<band>Detail</band>
<id>12</id>
<alignment>0</alignment>
<tabsequence>50</tabsequence>
<border>0</border>
<color>33554432</color>
<x>953</x>
<y>2</y>
<height>15</height>
<width>98</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>parcelpack_allow</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Arial</face>
<height>-10</height>
<weight>400</weight>
<family>2</family>
<pitch>2</pitch>
<charset>0</charset>
</font>
<background>
<mode>2</mode>
<color>16777215</color>
</background>
</ColumnObject>
<HtmlTable>
<border>1</border>
</HtmlTable>
......
webitm-wms/module-resource/sql/update.sql
View file @ 6fec68ec
......@@ -29697,4 +29697,152 @@ INSERT INTO messages (
commit;
--Changed by Pragyan Parcel Picking and LTL to master/parcel coverts
INSERT INTO messages (
msg_no ,
msg_str,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'ATLSTSELMP',
'Invalid selection',
'For Master Packing Shipment type should be As per route or Master',
'E',
'Y',
NULL,
NULL,
NULL,
TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
'base ',
'Pragyan ',
NULL,
NULL);
INSERT INTO messages (
msg_no ,
msg_str,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'ATLSTSELPP',
'Invalid selection',
'For Parcel Packing Shipment type should be As per route or Parcel',
'E',
'Y',
NULL,
NULL,
NULL,
TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
'base ',
'Pragyan ',
NULL,
NULL);
INSERT INTO messages (
msg_no ,
msg_str,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'ATLSTSENAN',
'Invalid selection',
'Only For Maste/Parcel Packing Shipment type should be Master/Parcel ',
'E',
'Y',
NULL,
NULL,
NULL,
TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
'base ',
'Pragyan ',
NULL,
NULL);
INSERT INTO messages (
msg_no ,
msg_str,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'ONSELCMP ',
'Invalid selection',
'Both Parcel and Master should not be selected for a shipment',
'E',
'Y',
NULL,
NULL,
NULL,
TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
'base ',
'Pragyan ',
NULL,
NULL);
INSERT INTO messages (
msg_no ,
msg_str,
msg_descr ,
msg_type ,
msg_opt ,
msg_time ,
alarm ,
err_source ,
chg_date ,
chg_user ,
chg_term ,
override_input ,
mail_option )
VALUES (
'INVDPIKLOC',
'Invalid Direct Pick',
'Invalid Direct Pick Location',
'E',
'Y',
NULL,
NULL,
NULL,
TO_DATE('25-02-2013 18:49:58','DD-MM-YYYY HH24:MI:SS'),
'base ',
'Pragyan ',
NULL,
NULL);
alter table location add direct_pick char(1);
alter table distroutedet add ship_type char(1);
commit;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment