Commit 155882a4 authored by ssarkar's avatar ssarkar

changes done on 01/02/13 as per qty_stduom


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92630 ce508802-f39f-4f6c-b175-0d175dae99d5
parent d7653d26
...@@ -50,7 +50,6 @@ public class ConsolidatToDoc { ...@@ -50,7 +50,6 @@ public class ConsolidatToDoc {
String tarHaz = ""; String tarHaz = "";
String source = ""; String source = "";
String user = ""; String user = "";
//Changed by Rohan on 06-10-12 to define variable for hazmap report.end
PreparedStatement pstmt = null, pstmt1 = null,pstmtHdr = null; PreparedStatement pstmt = null, pstmt1 = null,pstmtHdr = null;
ResultSet rs = null, rs1 = null; ResultSet rs = null, rs1 = null;
...@@ -73,6 +72,8 @@ public class ConsolidatToDoc { ...@@ -73,6 +72,8 @@ public class ConsolidatToDoc {
double meffQty = 0, qtyStduom = 0,qtyStduom1= 0, convQtyStduom = 0, conRtuStduom = 0, convFact = 1, quantity = 0; double meffQty = 0, qtyStduom = 0,qtyStduom1= 0, convQtyStduom = 0, conRtuStduom = 0, convFact = 1, quantity = 0;
double grossWeight = 0d, tareWeight = 0d, netWeight = 0d;//Gulzar on 29/12/11 double grossWeight = 0d, tareWeight = 0d, netWeight = 0d;//Gulzar on 29/12/11
double rate = 0d; double rate = 0d;
//Changed by sumit on 01/02/13
double convertQty = 0.0;
int noArt = 0; int noArt = 0;
double shipperSize = 0; double shipperSize = 0;
double totalGrossWeight = 0,totalTareWeight = 0,totalNetWeight = 0; double totalGrossWeight = 0,totalTareWeight = 0,totalNetWeight = 0;
...@@ -726,17 +727,30 @@ public class ConsolidatToDoc { ...@@ -726,17 +727,30 @@ public class ConsolidatToDoc {
{ {
if(!unit.equalsIgnoreCase(mbaseUnit)) if(!unit.equalsIgnoreCase(mbaseUnit))
{ {
if(conRtuStduom != 0) //Changed by sumit on 01/02/13 setting convFact = 0 as this need for reverse the quantity start
/*if(conRtuStduom != 0)
{ {
convFact = conRtuStduom; convFact = conRtuStduom;
} }*/
convFact = 0;
//Changed by sumit on 01/02/13 setting convFact = 0 as this need for reverse the quantity end.
ArrayList convQtyList = disCommon.getConvQuantityFact(mbaseUnit, unit, itemCode, quantity, convFact,conn); ArrayList convQtyList = disCommon.getConvQuantityFact(mbaseUnit, unit, itemCode, quantity, convFact,conn);
System.out.println("convQtyList = "+convQtyList); System.out.println("convQtyList = "+convQtyList);
//Changed by sumit on 01/02/13 converting from stock unit to order unit start
convertQty = Double.parseDouble(convQtyList.get(1).toString());
if(convertQty == -999999999)
{
convertQty = 0;
}
//Changed by sumit on 01/02/13 converting from stock unit to order unit end
if (conRtuStduom == 0) if (conRtuStduom == 0)
{ {
conRtuStduom= Double.parseDouble(convQtyList.get(0).toString()); conRtuStduom= Double.parseDouble(convQtyList.get(0).toString());
} }
} }
else else
{ {
...@@ -750,7 +764,6 @@ public class ConsolidatToDoc { ...@@ -750,7 +764,6 @@ public class ConsolidatToDoc {
} }
lineNo++; lineNo++;
//Changes by gulzar on 12/28/2011 //Changes by gulzar on 12/28/2011
despLineNo = " " + lineNo; despLineNo = " " + lineNo;
despLineNo = despLineNo.substring( despLineNo.length()-3 ); despLineNo = despLineNo.substring( despLineNo.length()-3 );
...@@ -783,7 +796,9 @@ public class ConsolidatToDoc { ...@@ -783,7 +796,9 @@ public class ConsolidatToDoc {
pstmt1.setString(8, lotNo.trim()); pstmt1.setString(8, lotNo.trim());
pstmt1.setString(9, lotSl.trim()); pstmt1.setString(9, lotSl.trim());
pstmt1.setDouble(10, quantityOrd); pstmt1.setDouble(10, quantityOrd);
pstmt1.setDouble(11, quantity); //Changed by sumit on 01/02/13 inserting qty as per ordered unit
//pstmt1.setDouble(11, quantity);
pstmt1.setDouble(11, convertQty);
pstmt1.setString(12, checkNull(locCodeTo)); pstmt1.setString(12, checkNull(locCodeTo));
//Changed By Pragyan to set " " one blank character in status as per manoharan sir //Changed By Pragyan to set " " one blank character in status as per manoharan sir
...@@ -793,7 +808,9 @@ public class ConsolidatToDoc { ...@@ -793,7 +808,9 @@ public class ConsolidatToDoc {
pstmt1.setDouble(14 , convQtyStduom ); pstmt1.setDouble(14 , convQtyStduom );
pstmt1.setString(15 , mbaseUnit); pstmt1.setString(15 , mbaseUnit);
pstmt1.setString(16 , unit); pstmt1.setString(16 , unit);
pstmt1.setDouble(17 , qtyStduom ); //Changed by sumit on 01/02/13 like QUANTITY__STDUOM = QUANTITY_REAL = SORDDET.QUANTITY__STDUOM
//pstmt1.setDouble(17 , qtyStduom );
pstmt1.setDouble(17 , quantity );
pstmt1.setDouble(18 , quantity); pstmt1.setDouble(18 , quantity);
//"RATE_STDUOM, PACK_INSTR, NO_ART, SITE_CODE, PACK_QTY, GROSS_WEIGHT, TARE_WEIGHT, " + //"RATE_STDUOM, PACK_INSTR, NO_ART, SITE_CODE, PACK_QTY, GROSS_WEIGHT, TARE_WEIGHT, " +
...@@ -1617,6 +1634,85 @@ public class ConsolidatToDoc { ...@@ -1617,6 +1634,85 @@ public class ConsolidatToDoc {
return errString; return errString;
} }
//Changed by Rohan 06/10/12 to printing Hazmat repoprt.end //Changed by Rohan 06/10/12 to printing Hazmat repoprt.end
//Changed by sumit on 31/01/12 convert qty as per as unit start
private double getStockQtyAfterConvert(String saleOrder, String lineNo,String itemCode,double quantity,int check, Connection conn) throws ITMException
{
String sql = "";
String itemUnit = "";
String orderUnit = "";
String unitStd = "";
double convQtyStduom = 0.0;
double newQty = 0.0;
double convFact = 0;
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
DistCommon discommon = new DistCommon();
//System.out.println(" -- saleOrder ["+saleOrder+"] lineNo ["+lineNo+"] itemCode ["+itemCode+"] ");
sql = "SELECT DISTINCT ITEM.UNIT ,SORDDET.UNIT AS ORDER_UNIT,SORDDET.UNIT__STD AS UNIT__STD, " +
" SORDDET.CONV__QTY_STDUOM FROM ITEM, SORDDET WHERE ITEM.ITEM_CODE = ? " +
" AND SORDDET.SALE_ORDER = ? AND SORDDET.LINE_NO = ? AND ITEM.ITEM_CODE = SORDDET.ITEM_CODE ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
pstmt.setString(2, saleOrder);
pstmt.setString(3, lineNo);
rs = pstmt.executeQuery();
if( rs.next())
{
itemUnit = rs.getString("UNIT");
orderUnit = rs.getString("ORDER_UNIT");
unitStd = rs.getString("UNIT__STD");
convQtyStduom = rs.getDouble("CONV__QTY_STDUOM");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
ArrayList convQtyList = new ArrayList();
if(!orderUnit.equalsIgnoreCase(unitStd))
{
if(convQtyStduom != 0 && check == 1)
{
convFact = convQtyStduom;
}
System.out.println(" orderUnit ["+orderUnit+"] itemUnit ["+itemUnit+"] unitStd ["+unitStd+"] convQtyStduom ["+convQtyStduom+"] convFact["+convFact+"]");
if( check == 1 )
{
convQtyList = new ArrayList();
convQtyList = discommon.getConvQuantityFact(orderUnit, unitStd, itemCode, quantity, convFact,conn);
}
else if ( check == 2 )
{
convQtyList = new ArrayList();
convQtyList = discommon.getConvQuantityFact(unitStd, orderUnit, itemCode, quantity, convFact,conn);
}
System.out.println("convQtyList = "+convQtyList);
newQty = Double.parseDouble(convQtyList.get(1).toString());
System.out.println("newQty ["+newQty+"]");
if(newQty == -999999999)
{
newQty = 0;
}
if (convQtyStduom == 0)
{
convQtyStduom= Double.parseDouble(convQtyList.get(0).toString());
}
}
else
{
newQty = quantity;
}
//pendingQty = meffQty;
}
catch(Exception ex)
{
ex.printStackTrace();
throw new ITMException(ex);
}
return newQty;
}
//Changed by sumit on 31/01/12 convert qty as per as unit end
} }
\ No newline at end of file
...@@ -240,6 +240,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -240,6 +240,10 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
String tranName = ""; String tranName = "";
PreparedStatement pstmtTran = null; PreparedStatement pstmtTran = null;
ResultSet rsTran = null; ResultSet rsTran = null;
//Changed By Pragyan 17/12/12 to get the standard UOM and order UOM.Start
String unit,unitStd,mbaseUnit = "";
double meffQty = 0,convQtyStduom = 0 ,convFact = 0, quantity = 0.0;
//Changed By Pragyan 17/12/12 to get the standard UOM and order UOM.End
//Change by Rohan on 19/07/12 to get transporter Info.start //Change by Rohan on 19/07/12 to get transporter Info.start
//Changed by sumit 22/08/12 to retrieve alloc_flag start. //Changed by sumit 22/08/12 to retrieve alloc_flag start.
PreparedStatement pstmt1 = null; PreparedStatement pstmt1 = null;
...@@ -555,6 +559,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -555,6 +559,8 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//Changed by sumit on 20/12/12 getting value of parcelpacking_allow //Changed by sumit on 20/12/12 getting value of parcelpacking_allow
//+" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW " //+" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW "
+" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW, WAVE_TYPE.PARCELPACK_ALLOW " +" ,SORDER.ALLOC_FLAG AS ALLOC_FLAG , WAVE_TYPE.MASTER_PACK_ALLOW , WAVE_TYPE.ACTIVE_PICK_ALLOW , WAVE_TYPE.STOCK_TO_DOCK_ALLOW, WAVE_TYPE.PARCELPACK_ALLOW "
//Changed by sumit on 31/01/13 adding column
+" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS UNIT__STD, SORDDET.CONV__QTY_STDUOM "
+"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM , WAVE_TYPE " +"FROM SORDDET,SORDER,SORDITEM,CUSTOMER,ITEM , WAVE_TYPE "
//Changed by sumit 20/08/12 getting column data end. //Changed by sumit 20/08/12 getting column data end.
+"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND " +"WHERE ( SORDER.SALE_ORDER = SORDDET.SALE_ORDER ) AND "
...@@ -717,6 +723,53 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -717,6 +723,53 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
stockToDockAllow = checkNull(rs.getString("STOCK_TO_DOCK_ALLOW")); stockToDockAllow = checkNull(rs.getString("STOCK_TO_DOCK_ALLOW"));
System.out.println("masterPackAllow ["+masterPackAllow+"] activePickAllow ["+activePickAllow+"] stockToDockAllow ["+stockToDockAllow+"]"); System.out.println("masterPackAllow ["+masterPackAllow+"] activePickAllow ["+activePickAllow+"] stockToDockAllow ["+stockToDockAllow+"]");
//Changed by sumit on 20/08/12 getting value of masterPackAllow, activePickAllow and activePickAllow start. //Changed by sumit on 20/08/12 getting value of masterPackAllow, activePickAllow and activePickAllow start.
//Changed By Pragyan 17/12/12 to get the standard UOM and order UOM.start
//+" ,ITEM.UNIT AS UNIT_STD ,SORDDET.UNIT ORDER_UNIT,SORDDET.UNIT__STD AS UNIT__STD, SORDDET.CONV__QTY_STDUOM"
mbaseUnit = checkNull(rs.getString("UNIT_STD"));
unit = checkNull(rs.getString("ORDER_UNIT"));
unitStd = checkNull(rs.getString("UNIT__STD"));
convQtyStduom = rs.getDouble("CONV__QTY_STDUOM");
System.out.println(" first mbaseUnit ["+mbaseUnit+"] unit ["+unit+"] unitStd ["+unitStd+"] convQtyStduom ["+convQtyStduom+"]");
if(unitStd != "")
{
mbaseUnit = unitStd;
}
if(!unit.equalsIgnoreCase(mbaseUnit))
{
if(convQtyStduom != 0)
{
convFact = convQtyStduom;
}
//converting for pending quantity
ArrayList convQtyList = discommon.getConvQuantityFact(unit, mbaseUnit, itemCode, pendingQty, convFact,conn);
System.out.println("convQtyList = "+convQtyList);
meffQty = Double.parseDouble(convQtyList.get(1).toString());
System.out.println("meffQty ["+meffQty+"]");
if(meffQty == -999999999)
{
meffQty = 0;
}
if (convQtyStduom == 0)
{
convQtyStduom= Double.parseDouble(convQtyList.get(0).toString());
}
pendingQty = meffQty;
//converting for quantity
convQtyList = new ArrayList();
convQtyList = discommon.getConvQuantityFact(unit, mbaseUnit, itemCode, rs.getDouble(8), convFact,conn);
quantity = Double.parseDouble(convQtyList.get(1).toString());
System.out.println("quantity ["+quantity+"]");
if(quantity == -999999999)
{
quantity = 0;
}
}
//Changed By Pragyan 17/12/12 to get the standard UOM and order UOM.end
System.out.println("pendingQty =["+pendingQty+"]"); System.out.println("pendingQty =["+pendingQty+"]");
System.out.println("partQty =["+partQty+"]"); System.out.println("partQty =["+partQty+"]");
System.out.println("singleLot =["+singleLot+"]"); System.out.println("singleLot =["+singleLot+"]");
...@@ -1058,7 +1111,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -1058,7 +1111,9 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//QUANTITY //QUANTITY
//Changed by sankara on 23/11/12 append quantity in porpar format //Changed by sankara on 23/11/12 append quantity in porpar format
//retTabSepStrBuff.append(rs.getDouble(8)).append("\t"); //retTabSepStrBuff.append(rs.getDouble(8)).append("\t");
retTabSepStrBuff.append( "<quantity><![CDATA[" ).append(rs.getDouble(8)).append( "]]></quantity>\r\n" ); //Changed by sumit on 1/02/13 display pending quantity after convert in std unit.
//retTabSepStrBuff.append( "<quantity><![CDATA[" ).append(rs.getDouble(8)).append( "]]></quantity>\r\n" );
retTabSepStrBuff.append( "<quantity><![CDATA[" ).append(quantity).append( "]]></quantity>\r\n" );
//Changed by sumit sarkar on 22/06/12 showing value of part quantity. //Changed by sumit sarkar on 22/06/12 showing value of part quantity.
//SHOWING VALUE OF PART QUANTITY //SHOWING VALUE OF PART QUANTITY
//Changed by sankara on 23/11/12 append part_qty in porpar format //Changed by sankara on 23/11/12 append part_qty in porpar format
...@@ -1067,9 +1122,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -1067,9 +1122,13 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
//PENDING_QUANTITY //PENDING_QUANTITY
//Changed by sankara on 23/11/12 append pending_quantity in porpar format //Changed by sankara on 23/11/12 append pending_quantity in porpar format
//retTabSepStrBuff.append(rs.getDouble(9)).append("\t"); //retTabSepStrBuff.append(rs.getDouble(9)).append("\t");
retTabSepStrBuff.append( "<pending_quantity><![CDATA[" ).append(rs.getDouble(9)).append( "]]></pending_quantity>\r\n" ); //Changed by sumit on 1/02/13 display pending quantity after convert in std unit.
//retTabSepStrBuff.append( "<pending_quantity><![CDATA[" ).append(rs.getDouble(9)).append( "]]></pending_quantity>\r\n" );
retTabSepStrBuff.append( "<pending_quantity><![CDATA[" ).append(pendingQty).append( "]]></pending_quantity>\r\n" );
//STOCK_QUANTITY //STOCK_QUANTITY
pendQty = rs.getDouble(9); //Changed by sumit on 1/02/13 pending qty after convert
//pendQty = rs.getDouble(9);
pendQty = pendingQty;
//***** check itemhashmap wheather current item_code already exists //***** check itemhashmap wheather current item_code already exists
// if not add to itemhashmap and get the stock as follows and set in // if not add to itemhashmap and get the stock as follows and set in
...@@ -2984,7 +3043,15 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo ...@@ -2984,7 +3043,15 @@ public class WaveGenerationPrc extends ProcessEJB implements WaveGenerationPrcLo
} }
rsSItem.close(); rsSItem.close();
updateSorditem ="UPDATE SORDITEM SET QTY_ALLOC = CASE WHEN QTY_ALLOC IS NULL THEN 0 ELSE QTY_ALLOC END + " + new Double(lotQtyToBeAllocated).toString() //Changed by sumit on 31/01/13 changing below quantity as per unit start
pendingQuantity = getStockQtyAfterConvert(saleOrder, lineNo, itemCodeOrd, pendingQuantity, 1, conn);
double newQuantity = 0.0;
newQuantity = getStockQtyAfterConvert(saleOrder, lineNo, itemCodeOrd, lotQtyToBeAllocated, 2, conn);
//Changed by sumit on 31/01/13 changing below quantity as per unit end
//Changed by sumit on 01/02/13 updating converted quantity
//updateSorditem ="UPDATE SORDITEM SET QTY_ALLOC = CASE WHEN QTY_ALLOC IS NULL THEN 0 ELSE QTY_ALLOC END + " + new Double(lotQtyToBeAllocated).toString()
updateSorditem ="UPDATE SORDITEM SET QTY_ALLOC = CASE WHEN QTY_ALLOC IS NULL THEN 0 ELSE QTY_ALLOC END + " + new Double(newQuantity).toString()
+" WHERE SALE_ORDER = '" + saleOrder + "' " +" WHERE SALE_ORDER = '" + saleOrder + "' "
+" AND LINE_NO = '" + lineNo + "' " +" AND LINE_NO = '" + lineNo + "' "
+" AND EXP_LEV = '" + expLev + "' "; +" AND EXP_LEV = '" + expLev + "' ";
...@@ -21471,4 +21538,85 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin ...@@ -21471,4 +21538,85 @@ private String getPickLocForSameItemLotNo(String invStat, String pickType, Strin
return locCodeTo; return locCodeTo;
} }
//Changed by sumit on 10/12/12 suggesting active location for same item code and lot No. end. //Changed by sumit on 10/12/12 suggesting active location for same item code and lot No. end.
//Changed by sumit on 31/01/12 convert qty as per unit start
private double getStockQtyAfterConvert(String saleOrder, String lineNo,String itemCode,double quantity,int check, Connection conn) throws ITMException
{
String sql = "";
String itemUnit = "";
String orderUnit = "";
String unitStd = "";
double convQtyStduom = 0.0;
double newQty = 0.0;
double convFact = 0;
PreparedStatement pstmt = null;
ResultSet rs = null;
try
{
//System.out.println(" -- saleOrder ["+saleOrder+"] lineNo ["+lineNo+"] itemCode ["+itemCode+"] ");
sql = "SELECT DISTINCT ITEM.UNIT ,SORDDET.UNIT AS ORDER_UNIT,SORDDET.UNIT__STD AS UNIT__STD, " +
" SORDDET.CONV__QTY_STDUOM FROM ITEM, SORDDET WHERE ITEM.ITEM_CODE = ? " +
" AND SORDDET.SALE_ORDER = ? AND SORDDET.LINE_NO = ? AND ITEM.ITEM_CODE = SORDDET.ITEM_CODE ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, itemCode);
pstmt.setString(2, saleOrder);
pstmt.setString(3, lineNo);
rs = pstmt.executeQuery();
if( rs.next())
{
itemUnit = rs.getString("UNIT");
orderUnit = rs.getString("ORDER_UNIT");
unitStd = rs.getString("UNIT__STD");
convQtyStduom = rs.getDouble("CONV__QTY_STDUOM");
}
rs.close(); rs = null;
pstmt.close(); pstmt = null;
ArrayList convQtyList = new ArrayList();
if(!orderUnit.equalsIgnoreCase(unitStd))
{
if(convQtyStduom != 0 && check == 1)
{
convFact = convQtyStduom;
}
System.out.println(" orderUnit ["+orderUnit+"] itemUnit ["+itemUnit+"] unitStd ["+unitStd+"] convQtyStduom ["+convQtyStduom+"] convFact["+convFact+"]");
if( check == 1 )
{
convQtyList = new ArrayList();
convQtyList = discommon.getConvQuantityFact(orderUnit, unitStd, itemCode, quantity, convFact,conn);
}
else if ( check == 2 )
{
convQtyList = new ArrayList();
convQtyList = discommon.getConvQuantityFact(unitStd, orderUnit, itemCode, quantity, convFact,conn);
}
System.out.println("convQtyList = "+convQtyList);
newQty = Double.parseDouble(convQtyList.get(1).toString());
System.out.println("newQty ["+newQty+"]");
if(newQty == -999999999)
{
newQty = 0;
}
if (convQtyStduom == 0)
{
convQtyStduom= Double.parseDouble(convQtyList.get(0).toString());
}
}
else
{
newQty = quantity;
}
//pendingQty = meffQty;
}
catch(Exception ex)
{
ex.printStackTrace();
throw new ITMException(ex);
}
return newQty;
}
//Changed by sumit on 31/01/12 convert qty as per unit end
} }
\ No newline at end of file
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