Skip to content

B
business-java
Commit cf9a8366 authored by vhegde's avatar vhegde
Browse files
Options

changed by sankara on 10/03/14 src, metadata,sql given by pragyan 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@94344 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9cc270d0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 439 additions and 125 deletions
webitm-wms/ibase/webitm/ejb/wms/PoRcpIC.java
View file @ cf9a8366
......@@ -150,7 +150,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
String partialGrlLoc="";
String locInvStat = "";
String altLotNo="";
String pordSiteCode = "";
int currentFormNo = 0, cnt = 0;
int counter = 0;
......@@ -277,7 +277,6 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
//End changes gulzar - 25/11/11
}
}
else if ( "loc_code".equalsIgnoreCase( childNodeName ) )
{
locCode = genericUtility.getColumnValue("loc_code", currDom );
......@@ -348,7 +347,7 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
if ( "site_code".equalsIgnoreCase( childNodeName ) )
{
siteCode = genericUtility.getColumnValue("site_code", currDom );
if( siteCode == null || siteCode.trim().length() == 0 )
{
// 26/10/11 manoharan all the errors should be returned so that warnings can be processed
......@@ -388,6 +387,42 @@ public class PoRcpIC extends ValidatorEJB implements PoRcpICRemote, PoRcpICLocal
errFields.add( childNodeName.toLowerCase() );
// end 26/10/11 manoharan all the errors should be returned so that warnings can be processed
}
//Changed By Pragyan to add validation for diffrent site code in purchase order and receipt.start
else
{
asnNo = genericUtility.getColumnValue( "asn_no", hdrDom );
//SELECT TRAN_CODE,TRANS_MODE,PORD_TYPE FROM PORDER WHERE PURC_ORDER =
sql = "SELECT P.SITE_CODE__DLV FROM ASN_HDR A,PORDER P WHERE "
+" A.PURC_ORDER = P.PURC_ORDER AND A.ASN_NO = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, asnNo);
rs = pstmt.executeQuery();
if(rs.next())
{
pordSiteCode = checkNull(rs.getString("SITE_CODE__DLV"));
}
if (rs != null)
{
rs.close();
rs = null;
}
if (pstmt != null)
{
pstmt.close();
pstmt = null;
}
if(!pordSiteCode.equalsIgnoreCase(siteCode))
{
errList.add( "VTCPORDS" );
errFields.add( childNodeName.toLowerCase() );
}
}
//Changed By Pragyan to add validation for diffrent site code in purchase order and receipt.end
}
}
else if ( "supp_code".equalsIgnoreCase( childNodeName ) )
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentPos.java
View file @ cf9a8366
......@@ -36,6 +36,7 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
String sql = "";
String transporterCode = "";
String waveTranCode = "";
String currPrintStatus = "";
String despTranCode = "";
String refId = "";
String shipmentId = "";
......@@ -115,7 +116,8 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
pstmt = null;
//sql = " SELECT TRAN_CODE FROM WAVE_STATUS_ORG WHERE WAVE_ID = ? ";
sql = " SELECT TRAN_CODE FROM WAVE_STATUS_ORG WHERE PTCN = ? ";
//sql = " SELECT TRAN_CODE FROM WAVE_STATUS_ORG WHERE PTCN = ? ";
sql = " SELECT TRAN_CODE__NEW FROM WAVE_STATUS_ORG WHERE PTCN = ? ";
pstmt = conn.prepareStatement(sql);
//pstmt.setString( 1, waveId);
pstmt.setString( 1, PTCN);
......@@ -123,8 +125,10 @@ public class ShipmentPos extends ValidatorEJB implements ShipmentPosLocal, Shipm
if(rs.next())
{
waveTranCode = checkNull(rs.getString("TRAN_CODE"));
waveTranCode = checkNull(rs.getString("TRAN_CODE__NEW"));
//currPrintStatus = checkNull(rs.getString("PRINT_STATUS")); //PRINT_STATUS
System.out.println("WAVETRANCODE=="+waveTranCode);
System.out.println("currPrintStatus=="+currPrintStatus);
}
rs.close();
......
webitm-wms/ibase/webitm/ejb/wms/ShipmentPrc.java
View file @ cf9a8366
......@@ -441,7 +441,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
String tranId = "";
// changed by sankara on 17/08/13 define variables for manual ship start..
ResultSet rs1 = null;
String refser = "";
//String refser = "";
// changed by sankara on 17/08/13 define variables for manual ship end..
HashMap carrMap = new HashMap();
// Set shipmentSet = new java.util.TreeSet();
......@@ -496,6 +496,12 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
if ( childNode != null && childNode.getFirstChild() != null )
{
shipmentId = checkNull(childNode.getFirstChild().getNodeValue());
//changed by sankara on 07/03/14 for parcel pick update through adsi start.
if(shipmentId != null && shipmentId.length() > 0)
{
shipmentSet.add(shipmentId);
}
//changed by sankara on 07/03/14 for parcel pick update through adsi end.
}
}
else if("tran_name".equalsIgnoreCase(childNodeName))
......@@ -505,8 +511,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
transporterName = checkNull(childNode.getFirstChild().getNodeValue());
}
}
shipmentSet.add(shipmentId);
//changed by sankara on 07/03/14 for parcel pick update through adsi start.
//shipmentSet.add(shipmentId);
}
}
......@@ -533,6 +539,7 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
if(shipmentSet != null && shipmentSet.size() >0)
{
System.out.println("Shipment Ids ................["+shipmentSet.toString()+"]");
soap = locator.getADSIShippingSoap(new URL(adsiShippingURL));
}
long timeAfter = System.currentTimeMillis();
......@@ -572,16 +579,31 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
" UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T WHERE S.PTCN = C.PTCN " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARRIER_FRIENDLYNAME IS NOT NULL " ;*/
sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, TRANSPORTER T " +
//changed by sankara on 07/03/14 for parcel pick update start.
/* sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, TRANSPORTER T " +
" WHERE P.SHIPMENT_ID = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T,PACK_HDR PH WHERE S.PTCN = C.PTCN " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' ";
" AND C.STATUS <> 'R' "; */
sql = " SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIPMENT_CONTENT N, SHIPMENT P, TRANSPORTER T " +
" WHERE P.SHIPMENT_ID = ? AND P.SHIPMENT_ID = N.SHIPMENT_ID AND P.TRAN_CODE = T.TRAN_CODE AND N.CARTON_NO = C.CARTON_NO AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T,PACK_HDR PH WHERE S.PTCN = C.PTCN " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'M' AND PH.OUTER_CARTON_NO = C.MASTER_CARTON AND PH.CONFIRMED = 'Y' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' "+
" UNION " +
" SELECT DISTINCT C.CARRIER_FRIENDLYNAME, T.SHIPMENT_TYPE, C.TRACKING_NO FROM CARTON_MASTER C, SHIP_DOCS S, SHIPMENT P, TRANSPORTER T WHERE S.PTCN = C.PTCN " +
" AND S.SHIPMENT_ID = ? AND S.SHIPMENT_ID = P.SHIPMENT_ID AND S.REF_SER = 'S-DSP' AND P.TRAN_CODE = T.TRAN_CODE AND C.CARTON_TYPE = 'P' AND C.CARRIER_FRIENDLYNAME IS NOT NULL " +
" AND C.STATUS <> 'R' "
;
//changed by sankara on 07/03/14 for parcel pick update end.
//changed by sankara on 04-02-14 for close out changes based on tracking numbers end.
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,shipmentId);
pstmt.setString(2,shipmentId);
//changed by sankara on 07/03/14 for parcel pick update
pstmt.setString(3,shipmentId);
rs = pstmt.executeQuery();
//changed by sankara on 04-02-14 for close out changes based on tracking numbers
//if( rs.next())
......@@ -630,7 +652,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
// updateSql= " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?)";
updateSql= " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ?) AND SF_IDENTITY IS NULL";
pstmt = conn.prepareStatement(updateSql); */
sql = " SELECT PTCN, REF_SER FROM SHIP_DOCS D, SHIPMENT S WHERE S.SHIPMENT_ID = D.SHIPMENT_ID AND D.SHIPMENT_ID = ? " ;
//changed by sankara on 07/03/14 for shipment passed in below satrt
/* sql = " SELECT PTCN, REF_SER FROM SHIP_DOCS D, SHIPMENT S WHERE S.SHIPMENT_ID = D.SHIPMENT_ID AND D.SHIPMENT_ID = ? " ;
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,shipmentId);
rs1 = pstmt1.executeQuery();
......@@ -664,7 +687,8 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
//" AND S.SHIPMENT_ID = ? ) AND SF_IDENTITY IS NULL " ;
" AND S.SHIPMENT_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ;
pstmt = conn.prepareStatement(updateSql);
}
}*/
//changed by sankara on 07/03/14 for shipment passed in below end.
// changed by sankara on 17//08/13 for updation of sf_idenity in manual ship case end..
if(carrMap != null && carrMap.size() > 0)
......@@ -779,9 +803,12 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
System.out.println("Carrier Name ----["+carrFndName+"]----sfIdentity["+sfIdentity+"]");
System.out.println("tmpListLen:::::"+tmpListLen);
//changed by sankara on 07/02/14 for getting refser
sql = " SELECT PTCN, REF_SER FROM SHIP_DOCS D, SHIPMENT S WHERE S.SHIPMENT_ID = D.SHIPMENT_ID AND D.SHIPMENT_ID = ? " ;
pstmt1 = conn.prepareStatement(sql);
for(int tmpCtr = 0;tmpCtr < tmpListLen; tmpCtr++)
{
shipmentIDs = (String)tempList.get(tmpCtr);
/*shipmentIDs = (String)tempList.get(tmpCtr);
//changed by sankara on 04-02-14 for close out changes based on tracking numbers
//trackingNumber = (String)tracknumList.get(tmpCtr);
//System.out.println("trackingNumberS::::::::"+trackingNumber);
......@@ -795,23 +822,71 @@ public class ShipmentPrc extends ProcessEJB implements ShipmentPrcLocal,Shipment
{
System.out.println("Update count ["+count+"]");
}
pstmt.clearParameters();
pstmt.clearParameters();*/
String ptcns = "";
String refser = "";
shipmentIDs = (String)tempList.get(tmpCtr);
System.out.println("Current Shipment ID :::"+shipmentIDs);
pstmt1.setString(1,shipmentIDs);
rs1 = pstmt1.executeQuery();
if( rs1.next())
{
ptcns = checkNull(rs1.getString("PTCN"));
refser = checkNull(rs1.getString("REF_SER"));
System.out.println("ptcns:::"+ptcns);
System.out.println("refser:::"+refser);
System.out.println("Getting the values for Current Shipment ID :::"+shipmentIDs+"]["+refser);
}
pstmt1.clearParameters();
if(rs1 != null)
{
System.out.println("closing record set");
rs1.close();
rs1 = null;
}
if( ptcns != null && refser.trim().equalsIgnoreCase("S-DSP") )
{
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE PTCN IN (SELECT PTCN FROM SHIP_DOCS WHERE SHIPMENT_ID = ? ) AND STATUS = 'U' AND CARTON_TYPE IN ('M','P') AND SF_IDENTITY IS NULL " ;
}
if((ptcns == null || ptcns.trim().length() == 0) && !refser.trim().equalsIgnoreCase("S-DSP") )
{
updateSql = " UPDATE CARTON_MASTER SET SF_IDENTITY = ? WHERE CARTON_NO IN ( SELECT CARTON_NO FROM SHIPMENT_CONTENT C, SHIP_DOCS D, SHIPMENT S " +
" WHERE S.SHIPMENT_ID = D.SHIPMENT_ID OR D.SHIPMENT_ID IS NULL AND S.SHIPMENT_ID = C.SHIPMENT_ID " +
" AND S.SHIPMENT_ID = ? ) AND STATUS = 'U' AND SF_IDENTITY IS NULL " ;
}
pstmt = conn.prepareStatement(updateSql);
pstmt.setString(1,sfIdentity);
pstmt.setString(2,shipmentIDs);
count = pstmt.executeUpdate();
if(count > 0)
{
System.out.println("Update count ["+count+"]");
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
}
if(pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
}
if(rs1 != null)
{
rs1.close();
rs1 = null;
}
sfIdentity = "";
}
}
if(pstmt!=null)
{
pstmt.close();
pstmt = null;
}
if(!isError)
{
System.out.println("******UPDATEDCOUNT="+count);
errCode = "PRCESSFUL";
errString = itmDBAccessEJB.getErrorString("","PRCESSFUL",userId);
}
......
webitm-wms/ibase/webitm/ejb/wms/WaveGenerationPrc.java
View file @ cf9a8366
......@@ -4598,7 +4598,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
}
}
//Changed by sumit sarkar on 23/08/11 [ WM1ESUN006 ] to make compitable to call updateWaveTask() method.
//private String sorderAllocate(String saleOrder, String lineNo, String itemCode, double allocQty, String expLev) throws ITMException
private String sorderAllocate(Document headerDom, Document detailDom , String saleOrder, String lineNo, String itemCode, double allocQty,String singleLot,double pendingQty,String isActivePickChecked,String isMasterPackChecked,String isStockToDockChecked,String isParcelPickChecked, String expLev, String xtraParams,String shipTypeLine, Connection conn ) throws ITMException
......@@ -6258,7 +6258,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String locCode = "";
String suggLoc = "";
String sLocCode = "";
String sitCodeWave = "";
double quantity = 0.0;
double itemWeight = 0.0;
double itemVolume = 0.0;
......@@ -6286,6 +6286,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
sitCodeWave = genericUtility.getColumnValue("site_code",headerDom);
saleOrderFrom = genericUtility.getColumnValue("sale_order__from",headerDom);
saleOrderTo = genericUtility.getColumnValue("sale_order__to",headerDom);
custCodeFrom = genericUtility.getColumnValue("cust_code__from",headerDom);
......@@ -6325,9 +6326,11 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
"SALE_ORDER__FROM, SALE_ORDER__TO, CUST_CODE__FROM, " +
//Changed By Pragyan 22/08/12 To add Hold Status
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE)" +
"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL)" +
//"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL)" +
"CUST_CODE__TO, DUE_DATE__FROM, DUE_DATE__TO, CHG_USER, CHG_TERM, CHG_DATE,HOLD_STATUS,CANCEL,SITE_CODE)" +
//"VALUES (?,?,?,?,?,?,?,?,?,?,?)";
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
//"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)";
"VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
//Changed by Rohan on 1-12-11 on [WM1ESUN006] to add ptcn into wave_task.end
pstmt = conn.prepareStatement(insertSql);
pstmt.setString(1,waveId);
......@@ -6344,7 +6347,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//pstmt.setDate(11,currdate); //Commented by Chandni 01-june-2012
pstmt.setTimestamp(11,currdate); //Added by Chandni 01-june-2012
pstmt.setString(12,"N");
pstmt.setString(13,"N");
pstmt.setString(13,"N");
//Changed By Pragyan 28/feb/13
pstmt.setString(14,sitCodeWave);
pstmt.executeUpdate();
System.out.println("Start Wave Genartion.......................");
......@@ -10034,6 +10039,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if("Y".equalsIgnoreCase(isRepl))
{
updateStkReplQty(locCode, itemCode, lotNo, lotSl, Double.parseDouble(replQuantity), conn);
pstmtRplDet.setString(1,replRefDeepId);
pstmtRplDet.setInt(2,replCtr);
pstmtRplDet.setString(3,saleOrder);
......@@ -10407,6 +10414,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
if("Y".equalsIgnoreCase(isRepl))
{
updateStkReplQty(locCode, itemCode, lotNo, lotSl, Double.parseDouble(replQuantity), conn);
pstmtRplDet.setString(1,replRefDeepId);
pstmtRplDet.setInt(2,replCtr);
pstmtRplDet.setString(3,saleOrder);
......@@ -13250,8 +13258,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
Timestamp currDate = new Timestamp(System.currentTimeMillis());
tranId = getTranId("w_wave_stat_org", conn);
sqlInsertData = "INSERT INTO WAVE_STATUS_ORG (TRAN_ID, WAVE_ID,TRAN_CODE,PTCN,CHG_USER,CHG_DATE,CHG_TERM,PRINT_STATUS,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME)"+
" VALUES (?,?,?,?,?,?,?,?,?,?)";
/* sqlInsertData = "INSERT INTO WAVE_STATUS_ORG (TRAN_ID, WAVE_ID,TRAN_CODE,PTCN,CHG_USER,CHG_DATE,CHG_TERM,PRINT_STATUS,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME)"+
" VALUES (?,?,?,?,?,?,?,?,?,?)";*/
sqlInsertData = "INSERT INTO WAVE_STATUS_ORG (TRAN_ID, WAVE_ID,TRAN_CODE,PTCN,CHG_USER,CHG_DATE,CHG_TERM,PRINT_STATUS,CARRIER_SYMBOL,CARRIER_FRIENDLYNAME,TRAN_CODE__NEW)"+
" VALUES (?,?,?,?,?,?,?,?,?,?,?)";
pstmtInsertData = conn.prepareStatement(sqlInsertData);
pstmtInsertData.setString(1,tranId);
......@@ -13264,6 +13274,7 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
pstmtInsertData.setString(8,"Y");
pstmtInsertData.setString(9,carrierSymbol);
pstmtInsertData.setString(10,carrierFriendlyName);
pstmtInsertData.setString(11,tranCode);
//Chnaged by sumit on 03/04/12
......@@ -18651,6 +18662,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
ResultSet rsLoc = null;
//Changed by Rohan on 27/07/12.end
int lineNoReplHis=0;
//Changed By Pragyan 24-feb-14 ^^^^^
double replQty = 0.0;
double quantityReplHis=0.0,actualQtyReplHis =0.0;
boolean isReplanished = false;
//Changed by Rohan on 28/07/12 to crate list.start
......@@ -18689,7 +18702,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by Rohan on 07-02-13 not consider pnd repanishment in case of active repanishment
sqlReplHistory = "SELECT D.LOC_CODE,D.REPL_ORDER,D.QUANTITY,D.ACTUAL_QTY,D.LOC_CODE__TO,D.LINE_NO,D.PICK_ORDER,"
+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L,REPL_ORD_HDR H WHERE D.ITEM_CODE = ? AND "
//Changed By Pragyan 24-feb-14 ^^^^^
//+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L,REPL_ORD_HDR H WHERE D.ITEM_CODE = ? AND "
+ " D.LINE_NO__PICK,S.QUANTITY AS STK_QTY,REPL_QTY AS REPL_QTY FROM REPL_ORD_DET D,STOCK S ,LOCATION L,REPL_ORD_HDR H WHERE D.ITEM_CODE = ? AND "
+" D.SITE_CODE = ? AND D.LOT_NO = ? AND D.LOT_SL = ?"
+" AND D.ITEM_CODE = S.ITEM_CODE AND D.SITE_CODE = S.SITE_CODE "
//Changed by Rohan on 13-02-13 add partial reserv location in map.start
......@@ -18719,11 +18734,12 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
{
isReplanished = true;
locCodeRepl = rsReplHistory.getString("LOC_CODE");
replOrderHis=rsReplHistory.getString("REPL_ORDER");
quantityReplHis= rsReplHistory.getDouble("QUANTITY");
actualQtyReplHis =rsReplHistory.getDouble("ACTUAL_QTY");
locCodeToHis=rsReplHistory.getString("LOC_CODE__TO");
replOrderHis = rsReplHistory.getString("REPL_ORDER");
quantityReplHis = rsReplHistory.getDouble("QUANTITY");
actualQtyReplHis = rsReplHistory.getDouble("ACTUAL_QTY");
locCodeToHis = rsReplHistory.getString("LOC_CODE__TO");
//^^^^^
replQty = rsReplHistory.getDouble("REPL_QTY");
System.out.println("locCodeToHis********"+locCodeToHis);
lineNoReplHis=rsReplHistory.getInt("LINE_NO");
//Changed by Rohan on 27/07/12 to move location form caspick location to DOCK location
......@@ -18890,6 +18906,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
tempHisMap.put("PICK_ORD",picOrd);
tempHisMap.put("LINE_NO_PICK",lineNoPick);
System.out.println("Stock Quantity"+stkQty+"FOR locCodeRepl"+locCodeRepl);
//^^^^^^^
tempHisMap.put("REPL_QTY",replQty);
tempHisList.add(tempHisMap);
System.out.println("tempHisList$$$$$"+tempHisList);
System.out.println("itemCodeHis"+itemCodeHis+"]siteCodeHis["+siteCodeHis+"]lotNoHis["+lotNoHis+"]lotSlHis["+lotSlHis+"]locCodeHis["+locCodeHis+"]locCodeRepl["+locCodeRepl);
......@@ -22019,4 +22037,51 @@ public void updateBackOrderStatus (String salesOrder, Connection conn) throws IT
}
}
//changed by sankara on 24/09/13 for update status in sorddet end.
//changed by Pragyan on 28/FEB/14 for update repl qty in stock.start
public void updateStkReplQty(String locCode,String itemCode,String lotNo,String lotSl,double replQty, Connection conn) throws ITMException
{
String sql = "";
int upddateStatus = 0;
PreparedStatement pstmtupdate = null;
try
{
sql = " UPDATE STOCK SET REPL_QTY = ? " +
" WHERE LOC_CODE = ? AND ITEM_CODE = ? AND LOT_NO = ? AND LOT_SL = ? AND ALLOC_QTY > 0";
pstmtupdate = conn.prepareStatement(sql);
pstmtupdate.setDouble(1, replQty);
pstmtupdate.setString(2, locCode);
pstmtupdate.setString(3, itemCode);
pstmtupdate.setString(4, lotNo);
pstmtupdate.setString(5, lotSl);
upddateStatus = pstmtupdate.executeUpdate();
}
catch(Exception ex)
{
ex.printStackTrace();
throw new ITMException(ex);
}
finally
{
try
{
if(pstmtupdate != null)
{
pstmtupdate.close();
pstmtupdate = null;
}
}
catch(Exception ex)
{
ex.printStackTrace();
throw new ITMException(ex);
}
}
}
//changed by Pragyan on 28/FEB/14 for update repl qty in stock.end
}
\ No newline at end of file
webitm-wms/module-resource/metadata/wave_task11.xml
View file @ cf9a8366
......@@ -32,7 +32,7 @@
<grid.lines>0</grid.lines>
</BaseDefinition>
<Header>
<height>22</height>
<height>20</height>
<color>536870912</color>
</Header>
<Summary>
......@@ -147,7 +147,14 @@
<name>status</name>
<dbname>status</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;wave_task&quot; ) COLUMN(NAME=&quot;wave_task.wave_id&quot;) COLUMN(NAME=&quot;wave_task.tran_date&quot;) COLUMN(NAME=&quot;wave_task.sale_order__from&quot;) COLUMN(NAME=&quot;wave_task.sale_order__to&quot;) COLUMN(NAME=&quot;wave_task.cust_code__from&quot;) COLUMN(NAME=&quot;wave_task.cust_code__to&quot;) COLUMN(NAME=&quot;wave_task.due_date__from&quot;) COLUMN(NAME=&quot;wave_task.due_date__to&quot;) COLUMN(NAME=&quot;wave_task.chg_user&quot;) COLUMN(NAME=&quot;wave_task.chg_term&quot;) COLUMN(NAME=&quot;wave_task.chg_date&quot;) COLUMN(NAME=&quot;wave_task.hold_status&quot;) COLUMN(NAME=&quot;wave_task.cancel&quot;) COMPUTE(NAME=&quot;CASE WHEN WAVE_TASK.CANCEL = &apos;Y&apos; then &apos;CANCELED&apos; WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM DUAL) = &apos;Y&apos; THEN &apos;COMPLETED&apos; ELSE &apos;PENDING&apos; END STATUS&quot;)WHERE( EXP1 =&quot;~&quot;WAVE_TASK~&quot;.~&quot;TRAN_DATE~&quot;&quot; OP =&quot;&gt;=&quot; EXP2 =&quot;:from_date&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;~&quot;WAVE_TASK~&quot;.~&quot;TRAN_DATE~&quot;&quot; OP =&quot;&lt;=&quot; EXP2 =&quot;:to_date&quot; ) ) ARG(NAME = &quot;from_date&quot; TYPE = datetime) ARG(NAME = &quot;to_date&quot; TYPE = datetime) </retrieve>
<table_column>
<type size="5">char</type>
<update>yes</update>
<updatewhereclause>yes</updatewhereclause>
<name>site_code</name>
<dbname>wave_task.site_code</dbname>
</table_column>
<retrieve>PBSELECT( VERSION(400) TABLE(NAME=&quot;wave_task&quot; ) COLUMN(NAME=&quot;wave_task.wave_id&quot;) COLUMN(NAME=&quot;wave_task.tran_date&quot;) COLUMN(NAME=&quot;wave_task.sale_order__from&quot;) COLUMN(NAME=&quot;wave_task.sale_order__to&quot;) COLUMN(NAME=&quot;wave_task.cust_code__from&quot;) COLUMN(NAME=&quot;wave_task.cust_code__to&quot;) COLUMN(NAME=&quot;wave_task.due_date__from&quot;) COLUMN(NAME=&quot;wave_task.due_date__to&quot;) COLUMN(NAME=&quot;wave_task.chg_user&quot;) COLUMN(NAME=&quot;wave_task.chg_term&quot;) COLUMN(NAME=&quot;wave_task.chg_date&quot;) COLUMN(NAME=&quot;wave_task.hold_status&quot;) COLUMN(NAME=&quot;wave_task.cancel&quot;) COMPUTE(NAME=&quot;CASE WHEN WAVE_TASK.CANCEL = &apos;Y&apos; then &apos;CANCELED&apos; WHEN ( SELECT FN_WAVE_STATUS(WAVE_ID) AS STATUS FROM DUAL) = &apos;Y&apos; THEN &apos;COMPLETED&apos; ELSE &apos;PENDING&apos; END STATUS&quot;) COLUMN(NAME=&quot;wave_task.site_code&quot;)WHERE( EXP1 =&quot;~&quot;WAVE_TASK~&quot;.~&quot;TRAN_DATE~&quot;&quot; OP =&quot;&gt;=&quot; EXP2 =&quot;:from_date&quot; LOGIC =&quot;and&quot; ) WHERE( EXP1 =&quot;~&quot;WAVE_TASK~&quot;.~&quot;TRAN_DATE~&quot;&quot; OP =&quot;&lt;=&quot; EXP2 =&quot;:to_date&quot; ) ) ARG(NAME = &quot;from_date&quot; TYPE = datetime) ARG(NAME = &quot;to_date&quot; TYPE = datetime) </retrieve>
<update>WAVE_TASK</update>
<updatewhere>1</updatewhere>
<updatekeyinplace>no</updatekeyinplace>
......@@ -474,10 +481,10 @@
<text>Changed User</text>
<border>6</border>
<color>0</color>
<x>947</x>
<x>1042</x>
<y>2</y>
<height>16</height>
<width>59</width>
<width>96</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -502,10 +509,10 @@
<text>Changed Term</text>
<border>6</border>
<color>0</color>
<x>1008</x>
<x>1140</x>
<y>2</y>
<height>16</height>
<width>62</width>
<width>88</width>
<html>
<valueishtml>0</valueishtml>
</html>
......@@ -530,7 +537,7 @@
<text>Change Date</text>
<border>6</border>
<color>0</color>
<x>1072</x>
<x>1230</x>
<y>2</y>
<height>16</height>
<width>80</width>
......@@ -552,6 +559,34 @@
<color>67108864</color>
</background>
</TextObject>
<TextObject>
<band>Header</band>
<alignment>2</alignment>
<text>Site Code</text>
<border>6</border>
<color>0</color>
<x>947</x>
<y>2</y>
<height>16</height>
<width>93</width>
<html>
<valueishtml>0</valueishtml>
</html>
<name>site_code_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>1</id>
......@@ -980,10 +1015,10 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>947</x>
<x>1042</x>
<y>0</y>
<height>19</height>
<width>59</width>
<width>96</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
......@@ -1019,10 +1054,10 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1008</x>
<x>1140</x>
<y>0</y>
<height>19</height>
<width>62</width>
<width>88</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
......@@ -1058,7 +1093,7 @@
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>1072</x>
<x>1230</x>
<y>0</y>
<height>19</height>
<width>80</width>
......@@ -1090,6 +1125,42 @@
<color>16777215</color>
</background>
</ColumnObject>
<ColumnObject>
<band>Detail</band>
<id>15</id>
<alignment>0</alignment>
<tabsequence>32766</tabsequence>
<border>5</border>
<color>33554432</color>
<x>947</x>
<y>2</y>
<height>16</height>
<width>93</width>
<format>[general]</format>
<html>
<valueishtml>0</valueishtml>
</html>
<name>site_code</name>
<visible>1</visible>
<EditStyle style="edit">
<limit>0</limit>
<case>any</case>
<autoselect>yes</autoselect>
<imemode>0</imemode>
</EditStyle>
<font>
<face>Times New Roman</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>
......
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