Skip to content

B
business-java
Commit 98145ddd authored by ppatro's avatar ppatro
Browse files
Options

last checked in wave gen 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93342 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 52fee249
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1354 additions and 430 deletions
webitm-wms/ibase/webitm/ejb/wms/AsnConf.java
View file @ 98145ddd
......@@ -44,6 +44,10 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
//Changed by sumit 24/01/13 start.
String suppCode = "",qtyStr = "", priceList = "";
String itemCode = "";
//Changed by Rohan on 11-07-13 for generate erraor with asn no,line no and item code.start
String lineNo = "";
String asnNo = "";
//Changed by Rohan on 11-07-13 for generate erraor with asn no,line no and item code.end
double quantity = 0.0, rate = 0.0;
java.util.Date currDate = null;
String dbDateFormat = null;
......@@ -102,8 +106,9 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
currDateStr = dateFormat.format(currDate);
SimpleDateFormat simpleDateFormatDB = new SimpleDateFormat(genericUtility.getDBDateFormat());
Timestamp timestamp = Timestamp.valueOf(simpleDateFormatDB.format(currDate).toString() + " 00:00:00.0");
sql = "SELECT AH.SUPP_CODE, AD.QUANTITY, AD.ITEM_CODE FROM ASN_HDR AH, ASN_DET AD WHERE AH.TRAN_ID = ? AND AH.TRAN_ID = AD.TRAN_ID";
//Changed by Rohan on 11-07-13 for generate erraor with asn no,line no and item code
//sql = "SELECT AH.SUPP_CODE, AD.QUANTITY, AD.ITEM_CODE FROM ASN_HDR AH, ASN_DET AD WHERE AH.TRAN_ID = ? AND AH.TRAN_ID = AD.TRAN_ID";
sql = "SELECT AH.SUPP_CODE, AD.QUANTITY, AD.ITEM_CODE,AD.LINE_NO,AH.ASN_NO FROM ASN_HDR AH, ASN_DET AD WHERE AH.TRAN_ID = ? AND AH.TRAN_ID = AD.TRAN_ID";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
......@@ -112,7 +117,10 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
suppCode = rs.getString("SUPP_CODE");
quantity = rs.getDouble("QUANTITY");
itemCode = rs.getString("ITEM_CODE");
System.out.println(" suppCode ["+suppCode+"] quantity ["+quantity+"] itemCode ["+itemCode+"]");
//Changed by Rohan on 11-07-13 for generate erraor with asn no,line no and item code
lineNo = checkNull(rs.getString("LINE_NO"));
asnNo = checkNull(rs.getString("ASN_NO"));
System.out.println(" suppCode ["+suppCode+"] quantity ["+quantity+"] itemCode ["+itemCode+"]"+"lineNo["+lineNo+"]");
sql = " SELECT PRICE_LIST FROM SUPPLIER WHERE SUPP_CODE = ?";
pstmt1 = conn.prepareStatement(sql);
......@@ -150,7 +158,11 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
//errString = getErrorString("rate","INVRATE",userId);
errList.add( "INVRATE" );
errFields.add( childNodeName.toLowerCase() );*/
errString = itmdbAccess.getErrorString("","INVRATE",loginEmpCode);
//
//errString = itmdbAccess.getErrorString("","INVRATE",loginEmpCode);
//Changed by Rohan on 11-07-13 for generate erraor with asn no,line no and item code
errString = getError(tranId,lineNo,itemCode,"INVRATE",conn);
System.out.println("errString"+errString);
return errString;
}
......@@ -804,59 +816,67 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
rs = null;
}
*/
sql = "SELECT SITE_CODE__ACCT, ADD1, ADD2, CITY, DESCR FROM SITE WHERE SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeBill = checkNull( rs.getString("SITE_CODE__ACCT") );
address1 = checkNull( rs.getString("ADD1") );
address2 = checkNull( rs.getString("ADD2") );
city = checkNull( rs.getString("CITY") );
siteDescr = checkNull( rs.getString("DESCR") );
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
if ( rs != null )
{
rs.close();
rs = null;
}
if( confirmed.equalsIgnoreCase("Y") )
{
int purCnt = 0;
sql = "SELECT COUNT(PURC_ORDER) AS PURCNT FROM PORDER WHERE PURC_ORDER = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if( rs.next() )
{
purCnt = rs.getInt("PURCNT");
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
if ( rs != null )
{
rs.close();
rs = null;
}
if( purCnt > 0 )
//Chnaged by Rohan on 09-07-13 for asn should allow pre-order purchase order.start
if(("".equalsIgnoreCase(purcOrder) || purcOrder == null) && purcOrder.trim().length() <= 0)
//Chnaged by Rohan on 09-07-13 for asn should allow pre-order purchase order.end
{
System.out.println("inside purcnt before");
errString = itmdbAccess.getErrorString("","PURORDEXST",userId);
System.out.println("inside purcnt before");
return errString;
}
else
{
sql = "SELECT SITE_CODE__ACCT, ADD1, ADD2, CITY, DESCR FROM SITE WHERE SITE_CODE = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, siteCode);
rs = pstmt.executeQuery();
if(rs.next())
{
siteCodeBill = checkNull( rs.getString("SITE_CODE__ACCT") );
address1 = checkNull( rs.getString("ADD1") );
address2 = checkNull( rs.getString("ADD2") );
city = checkNull( rs.getString("CITY") );
siteDescr = checkNull( rs.getString("DESCR") );
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
if ( rs != null )
{
rs.close();
rs = null;
}
//Chnaged by Rohan on 09-07-13 for asn should allow pre-order purchase order.start
/*
int purCnt = 0;
sql = "SELECT COUNT(PURC_ORDER) AS PURCNT FROM PORDER WHERE PURC_ORDER = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
rs = pstmt.executeQuery();
if( rs.next() )
{
purCnt = rs.getInt("PURCNT");
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
if ( rs != null )
{
rs.close();
rs = null;
}
if( purCnt > 0 )
{
System.out.println("inside purcnt before");
errString = itmdbAccess.getErrorString("","PURORDEXST",userId);
System.out.println("inside purcnt before");
return errString;
}
*/
//Chnaged by Rohan on 09-07-13 for asn should allow pre-order purchase order.end
remarks = "From ASN : " + tranIdAsnHdr;
sql = "SELECT DEPT_CODE FROM EMPLOYEE WHERE EMP_CODE = ? ";
pstmt = conn.prepareStatement(sql);
......@@ -1881,4 +1901,28 @@ public class AsnConf extends ActionHandlerEJB implements AsnConfLocal, AsnConfRe
return calculatedDate;
}
//Changed by Rohan on 11-07-13 for generate erraor with asn no,line no and item code.start
private String getError(String tranID,String lineNo,String asnNo,String Code,Connection conn) throws ITMException, Exception
{
String mainStr ="";
try
{
String errString = "";
errString = new ITMDBAccessEJB().getErrorString("",Code,"","",conn);
String begPart = errString.substring(0,errString.indexOf("<message>")+9);
String endDesc = errString.substring(errString.indexOf("</description>"));
mainStr= begPart+"Invalid Data "+"</message><description>";
mainStr= mainStr+"Tran ID:"+tranID+"Line No:"+lineNo+"ASN No:"+asnNo+endDesc;
System.out.println("mainStr:::::::::::::::::: "+mainStr);
begPart = null;
}
catch(Exception e)
{
e.printStackTrace();
throw new ITMException(e);
}
return mainStr;
}
//Changed by Rohan on 11-07-13 for generate erraor with asn no,line no and item code.end
}
webitm-wms/ibase/webitm/ejb/wms/AsnIC.java
View file @ 98145ddd
......@@ -108,7 +108,11 @@ public class AsnIC extends ValidatorEJB implements AsnICRemote,AsnICLocal
String childNodeName = "";
Node childNode =null;
String userId = "";
//Changed by Rohan on 08-07-13 for define variables.start
String confirm = "";
String purcOrder = "";
int count = 0;
//Changed by Rohan on 08-07-13 for define variables.end
java.util.Date currDate = null;
String dbDateFormat = null;
String applDateFormat = null;
......@@ -311,13 +315,16 @@ public class AsnIC extends ValidatorEJB implements AsnICRemote,AsnICLocal
if( columnValue != null && columnValue.trim().length() != 0 )
{
//sql = " SELECT COUNT(PURC_ORDER) AS CNT FROM PORCP WHERE PURC_ORDER = ?";//Commented by Gulzar on 12/26/2011
sql = " SELECT COUNT(PURC_ORDER) AS CNT FROM PORDER WHERE PURC_ORDER = ?";//Added by Gulzar on 12/26/2011
//Changed by Rohan on 08-07-13 to check purchse order confirm.start
//sql = " SELECT COUNT(PURC_ORDER) AS CNT FROM PORDER WHERE PURC_ORDER = ?";//Added by Gulzar on 12/26/2011
sql = "SELECT CONFIRMED FROM PORDER WHERE PURC_ORDER = ? ";//Added by Gulzar on 12/26/2011
System.out.println("sql ["+sql+" ]");
System.out.println("columnValue ["+columnValue+" ]");
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, columnValue);
rs = pstmt.executeQuery();
//Changed by Rohan on 08-07-13 to check purchse order confirm.start
/*
if( rs.next() )
{
cnt = rs.getInt("CNT");
......@@ -330,6 +337,17 @@ public class AsnIC extends ValidatorEJB implements AsnICRemote,AsnICLocal
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
*/
if( rs.next() )
{
confirm = rs.getString("CONFIRMED");
}
if(!"".equalsIgnoreCase(confirm) && !"Y".equalsIgnoreCase(confirm) )
{
errList.add( "VTPUCNTCNF" );
errFields.add( childNodeName.toLowerCase() );
}
//Changed by Rohan on 08-07-13 to check purchse order confirm.end
if( rs != null )
{
rs.close();
......@@ -582,6 +600,52 @@ public class AsnIC extends ValidatorEJB implements AsnICRemote,AsnICLocal
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
}
//Changed by Rohan on 09-07-13 for adding validation if purchase order and line no exist in porddet.start
else if ( "line_no__ord".equalsIgnoreCase( childNodeName ) )
{
purcOrder = checkNull(genericUtility.getColumnValue( "purc_order", dom1 ));
if((!"".equalsIgnoreCase(purcOrder) || purcOrder != null) && purcOrder.trim().length() > 0)
{
if ( childNode.getFirstChild() == null )
{
errList.add( "NULLPOLINE" );
errFields.add( childNodeName.toLowerCase() );
}
else
{
columnValue = " " + columnValue;
columnValue = columnValue.substring(columnValue.length()-3);
sql = "SELECT COUNT(*) AS PURCNT FROM PORDDET WHERE PURC_ORDER = ? AND LINE_NO = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
pstmt.setString(2, columnValue);
rs = pstmt.executeQuery();
if( rs.next() )
{
count = rs.getInt("PURCNT");
}
if(count <= 0)
{
errList.add( "VTINVPUORD" );
errFields.add( childNodeName.toLowerCase() );
}
if( pstmt != null )
{
pstmt.close();
pstmt = null;
}
if ( rs != null )
{
rs.close();
rs = null;
}
}
}
}
//Changed by Rohan on 09-07-13 for adding validation if purchase order and line no exist in porddet.end
}// for end
}//case 2 end
} //END switch
......@@ -745,8 +809,12 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
String sql = "";
String columnValue = "";
String siteCode = "",lotNo = "";
//Changed by Rohan on 09-07-13 for define variables.start
String purcOrderLineNo = "";
String purcOrder = "";
//Changed by Rohan on 09-07-13 for define variables.end
double itmQty=0;
Connection conn = null;
PreparedStatement pstmt = null;
StringBuffer valueXmlString = new StringBuffer();
......@@ -907,7 +975,26 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
case 2:
{
valueXmlString.append( "<Detail2>\r\n" );
if( currentColumn.trim().equalsIgnoreCase( "item_code" ) ||currentColumn.trim().equalsIgnoreCase( "quantity" ) || currentColumn.trim().equalsIgnoreCase( "lot_no" ))
//Chnaged by Rohan on 07-09-13 for make line no ord protected if purchase order present in 1st form.start
if( currentColumn.trim().equalsIgnoreCase( "itm_default" ) || currentColumn.trim().equalsIgnoreCase( "itm_defaultedit" ))
{
purcOrder = checkNull(genericUtility.getColumnValue("purc_order",dom1));
purcOrderLineNo = checkNull(genericUtility.getColumnValue("line_no__ord",dom));
if(("".equalsIgnoreCase(purcOrder.trim()) || purcOrder == null ) && purcOrder.trim().length() <= 0)
{
valueXmlString.append( "<line_no__ord protect ='1'><![CDATA[" ).append("").append( "]]></line_no__ord>\r\n" );
}
else
{
valueXmlString.append( "<line_no__ord protect ='0'><![CDATA[" ).append("").append( "]]></line_no__ord>\r\n" );
}
}
//Chnaged by Rohan on 07-09-13 for make line no ord protected if purchase order present in 1st form.end
else if( currentColumn.trim().equalsIgnoreCase( "item_code" ) ||currentColumn.trim().equalsIgnoreCase( "quantity" ) || currentColumn.trim().equalsIgnoreCase( "lot_no" ))
{
......@@ -958,7 +1045,38 @@ public String itemChanged( Document dom, Document dom1, Document dom2, String ob
}
}*/
//Changed by Rohan on 09-07-13 for based on purchase order and line no set item code,quantity,packsize and item description.start
if( currentColumn.trim().equalsIgnoreCase( "line_no__ord"))
{
purcOrderLineNo = genericUtility.getColumnValue("line_no__ord",dom);
purcOrderLineNo = " " + purcOrderLineNo;
purcOrderLineNo = purcOrderLineNo.substring(purcOrderLineNo.length()-3);
purcOrder = genericUtility.getColumnValue("purc_order",dom1);
sql = " SELECT P.ITEM_CODE,P.QUANTITY,K.SHIPPER_SIZE,I.DESCR FROM PORDDET P,ITEM I,ITEM_LOT_PACKSIZE K WHERE PURC_ORDER = ? AND LINE_NO = ? "
+ " AND P.ITEM_CODE = I.ITEM_CODE AND P.ITEM_CODE = K.ITEM_CODE ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, purcOrder);
pstmt.setString(2, purcOrderLineNo);
rs = pstmt.executeQuery();
if( rs.next() )
{
valueXmlString.append( "<descr><![CDATA[" ).append( checkNull( rs.getString( "DESCR" )) ).append( "]]></descr>\r\n" );
valueXmlString.append( "<item_code protect ='1'><![CDATA[" ).append( checkNull( rs.getString( "ITEM_CODE" )) ).append( "]]></item_code>\r\n" );
valueXmlString.append( "<quantity><![CDATA[" ).append( checkNull( rs.getString( "QUANTITY" )) ).append( "]]></quantity>\r\n" );
valueXmlString.append( "<pack_size protect ='1'><![CDATA[" ).append( checkNull( rs.getString( "SHIPPER_SIZE" )) ).append( "]]></pack_size>\r\n" );
valueXmlString.append( "<line_no__ord><![CDATA[" ).append( checkNull(purcOrderLineNo)).append( "]]></line_no__ord>\r\n" );
}
else
{
valueXmlString.append( "<descr><![CDATA[" ).append("").append( "]]></descr>\r\n" );
valueXmlString.append( "<item_code protect ='1'><![CDATA[" ).append("") .append( "]]></item_code>\r\n" );
valueXmlString.append( "<quantity><![CDATA[" ).append("").append( "]]></quantity>\r\n" );
valueXmlString.append( "<pack_size protect ='1'><![CDATA[" ).append("").append( "]]></pack_size>\r\n" );
}
}
//Changed by Rohan on 09-07-13 for based on purchase order and line no set item code,quantity,packsize and item description.end
valueXmlString.append( "</Detail2>\r\n" );
System.out.println("------------------------COMPLETE DESCRIPTION-------------------");
break;
......
webitm-wms/ibase/webitm/ejb/wms/GenerateLabelsPrc.java
View file @ 98145ddd
......@@ -457,8 +457,9 @@ public class GenerateLabelsPrc extends ProcessEJB implements GenerateLabelsPrcLo
Collections.sort(arryOuterCartonNo);
shipment2.setPackages2(packages2);
ShipmentResultReturn2 objReturn2=soap.shipWithLabel(shipment2, ShipWithLabelType.PNG, ImageRotation.Rotation_180);
//Changed By Pragyan as 11-jul-13 suggested by brian change it to default rotation
//ShipmentResultReturn2 objReturn2=soap.shipWithLabel(shipment2, ShipWithLabelType.PNG, ImageRotation.Rotation_180);
ShipmentResultReturn2 objReturn2=soap.shipWithLabel(shipment2, ShipWithLabelType.PNG, ImageRotation.Rotation_Default);
System.out.println("Is successfully Executed ["+objReturn2.isSuccess()+"]");
System.out.println("Return Messages ["+objReturn2.getMessage()+"]");
if(!objReturn2.isSuccess())
......
webitm-wms/module-resource/sql/update.sql
View file @ 98145ddd
......@@ -42031,4 +42031,127 @@ INSERT INTO disparm (
fn_sysdate(),
'BASE',
'Rohan');
--///12-jul-13
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 (
'VTPUCNTCNF',
'uncofirmed purchase order',
'Purchase Order not confirm.Please confirm Purchase Order ',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
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 (
'VTINVPUORD',
'Invalid purchase order',
'Purchase Order not exist.Please enter valid Purchase Order',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
NULL,
NULL);
INSERT INTO obj_itemchange(
obj_name,
form_no,
field_name,
mandatory)
VALUES (
'asn',
'2',
'line_no__ord',
NULL);
INSERT INTO obj_itemchange(
obj_name,
form_no,
field_name,
mandatory)
VALUES (
'asn',
'2',
'itm_default',
NULL);
INSERT INTO obj_itemchange(
obj_name,
form_no,
field_name,
mandatory)
VALUES (
'asn',
'2',
'itm_defaultedit',
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 (
'VTACTPKCSC',
'Invalid Selection of Actives',
'Sales Order in cases Active Pick should not Allowed',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
NULL,
NULL);
commit;
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