Skip to content

B
business-java
Commit 521b6272 authored by ppatro's avatar ppatro
Browse files
Options

changed by sankara on 31/12/13 update checkshhetpos wavwgenerationprc 

replissic and bol jr xml and xsd and messge sql for wms points


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94074 ce508802-f39f-4f6c-b175-0d175dae99d5
parent be024963
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 28 deletions
webitm-wms/ibase/webitm/ejb/wms/CheckSheetPos.java
View file @ 521b6272
......@@ -63,7 +63,9 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
ArrayList allPallets = new ArrayList<String>();
ITMDBAccessEJB itmDBAccessEJB = new ITMDBAccessEJB();
int noOfPalletScanned=0;
//Changed by sankara on 16/12/13 display bol report ptcn wise
String ptcns = "";
String errorString = "";
try
{
conn.setAutoCommit(false);
......@@ -194,6 +196,7 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
pstmt = null;
System.out.println("No of pallet scanned ="+noOfPalletScanned);
System.out.println("Total No of pallet ="+allPallets.size());
if(allPallets.size() == noOfPalletScanned)
{
//Changed by sumit on 05/10/12 commented as a wrong method.
......@@ -202,10 +205,22 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
System.out.println("SHIP CONF CALLED ");
errString = shipConf.confirm(shipmentId, xtraParams, forcedFlag);
System.out.println("Error String = "+errString);
//changed by sankara on 16/12/13 for getting conf message
errorString = errString;
if( errString.contains("VTCONFIRM") && printer.trim().length() > 0)
{
errString = generateBOLReport(shipmentId, printer, conn, xtraParams);
//Changed by sankara on 16/12/13 display bol report ptcn wise start.
//errString = generateBOLReport(shipmentId, printer, conn, xtraParams);
errString = generateBOLReport(shipmentId, "", printer, conn, xtraParams);
if(errString != null && errString.trim().length() > 0 )
{
return errString;
}
if(errString == null || errString.trim().length() == 0 )
{
return errorString;
}
//Changed by sankara on 16/12/13 display bol report ptcn wise end.
}
else
{
......@@ -310,7 +325,9 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
}
//Changed by sumit on 10/11/12 on
private String generateBOLReport(String shipmnetId, String printer, Connection conn, String xtraParams) throws ITMException
//changed by sankara on 31/12/13 for display bol report shipment id wise
//private String generateBOLReport(String shipmnetId, String printer, Connection conn, String xtraParams) throws ITMException
private String generateBOLReport(String shipmnetId, String ptcn, String printer, Connection conn, String xtraParams) throws ITMException
{
String sql = "";
String reportObjName = "";
......@@ -332,7 +349,9 @@ public class CheckSheetPos extends ValidatorEJB implements CheckSheetPosLocal, C
rs = pstmt.executeQuery();*/
ibase.webitm.reports.utility.JasperReportGenerator jrGenerator = new ibase.webitm.reports.utility.JasperReportGenerator();
String xsdString ="<Arguments>" +
"<Argument id=\"DESP_ID_FIRST\" name=\"DESP_ID_FIRST\">" +
//changed by sankara on 31/12/13 for display report shipment id wise
//"<Argument id=\"DESP_ID_FIRST\" name=\"DESP_ID_FIRST\">" +
"<Argument id=\"SHIPMENT_ID\" name=\"SHIPMENT_ID\">" +
"<argType>java.lang.String</argType>" +
"<value>"+shipmnetId+"</value>" +
"</Argument>" +
......
webitm-wms/ibase/webitm/ejb/wms/ReplIssIC.java
View file @ 521b6272
......@@ -818,7 +818,41 @@ public class ReplIssIC extends ValidatorEJB implements ReplIssICLocal, ReplIssIC
errList.add( "INVLDLOTSL" );
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
}
//changed by sankara on 05/12/13 for doing replenishment order wise start.
sql = " SELECT R.REPL_ORDER FROM REPL_ORD_HDR R, WAVE_TASK W, WAVE_TASK_DET WD, REPL_ORD_DET RT, STOCK S, LOCATION L " +
" WHERE R.REPL_ORDER = WD.REF_ID AND R.REPL_ORDER = RT.REPL_ORDER AND R.WAVE_ID = W.WAVE_ID AND S.LOC_CODE = L.LOC_CODE " +
" AND RT.LOC_CODE = L.LOC_CODE AND WD.STATUS = 'N' AND W.CANCEL = 'N' AND ( RT.CANCEL_MODE='N' OR RT.CANCEL_MODE IS NULL ) " +
" AND S.SITE_CODE = ? " +
" AND S.ITEM_CODE = ? " +
" AND S.LOC_CODE = ? " +
" AND S.LOT_NO = ? " +
" AND S.LOT_SL = ? "+
" ORDER BY REPL_ORDER ";
pstmt = conn.prepareStatement( sql );
pstmt.setString( 1, siteCode );
pstmt.setString( 2, itemCode );
pstmt.setString( 3, locCode );
pstmt.setString( 4, lotNo );
pstmt.setString( 5, lpnNo );
rs = pstmt.executeQuery();
if( rs.next() )
{
replOrd = checkNull(rs.getString("REPL_ORDER"));
System.out.println("replOrd-->"+replOrd);
System.out.println("headerreplOrder-->"+replOrder);
if( !replOrder.trim().equalsIgnoreCase( replOrd ) )
{
errList.add( "VTREPLORDR" );
errFields.add( childNodeName.toLowerCase() );
}
}
rs.close();
rs = null;
pstmt.close();
pstmt = null;
//changed by sankara on 05/12/13 for doing replenishment order wise end.
}
//else if ( "lot_sl_new".equalsIgnoreCase( childNodeName ) ) //added by kunal mandhre on 05/JUN/12 - WM1ESUN007
else if ( "lot_sl__new".equalsIgnoreCase( childNodeName ) && "active_repl_iss".equalsIgnoreCase(getObjNameFromDom(currFormDataDom, "objName", objContext)) ) //added by kunal mandhre on 05/JUN/12 - WM1ESUN007
......
webitm-wms/module-resource/sql/update.sql
View file @ 521b6272
......@@ -44919,4 +44919,34 @@ insert into messages(msg_no, msg_str, msg_descr, msg_type, msg_opt, chg_date, c
values ('VTLOCKCD1','Lock Code is blank!','Lock code can not be blank.Please enter lock code.','E','Y',sysdate,'BASE','BASE111');
-- ADDED BY RITESH ON 27/DEC/2013 FOR wms issue point no. 306 end
commit;
--changed by sankara on 31/12/2013 for repl order done wise based on stock pk
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 (
'VTREPLORDR',
'Replenishment Order mismatch',
'Replenishment should be done Order Wise',
'E',
'Y',
NULL,
NULL,
NULL,
fn_sysdate(),
'Base ',
'Base ',
NULL,
NULL);
commit;
\ No newline at end of file
webitm-wms/module-resource/xsd/bill_of_lading.xsd
View file @ 521b6272
......@@ -2,6 +2,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<arguments>
<argument name="DESP_ID_FIRST" type="java.lang.String" value="" visible="Y" editable="Y" table="" field="" SRVCALLONCHANGE="Y" label="PTCN :" inputType="text" caseType="upper" size="5" fontSize="10" alignment="2" fontName="" id="arg1" displayType="text" reportTitle="Bill of Lading" rowNo="1" colNo="1" height="15" width="70"/>
<argument name="SHIPMENT_ID" type="java.lang.String" value="" visible="N" editable="Y" table="" field="" SRVCALLONCHANGE="Y" label="Shipment Id :" inputType="text" caseType="upper" size="5" fontSize="10" alignment="2" fontName="" id="arg1" displayType="text" reportTitle="Bill of Lading" rowNo="1" colNo="2" height="15" width="70"/>
<argument name="x_path" type="java.lang.String" value="/DocumentRoot/Bill_of_lading" visible="N" editable="N" table="" field="" SRVCALLONCHANGE="N" label="" inputType="text" caseType="mixed" size="50" format="string" fontSize="10" alignment="2" fontName="" id="arg8" displayType="text" reportTitle="Bill of Lading" rowNo="5" colNo="1" height="15" width="70"/>
<argument name="design_source" type="java.lang.String" value="Bill_of_lading.jrxml" visible="N" editable="N" table="" field="" SRVCALLONCHANGE="N" label="" inputType="text" caseType="mixed" size="50" format="string" fontSize="10" alignment="2" fontName="" id="arg9" displayType="text" reportTitle="Bill of Lading" rowNo="6" colNo="1" height="15" width="70"/>
<argument name="data_source" type="java.lang.String" value="SQL" visible="N" editable="N" table="" field="" SRVCALLONCHANGE="N" label="" inputType="text" caseType="mixed" size="50" format="string" fontSize="10" alignment="2" fontName="" id="arg9" displayType="text" reportTitle="Bill of Lading" rowNo="7" colNo="1" height="15" width="70"/>
......
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