Skip to content

B
business-java
Commit 564e5b53 authored by manohar's avatar manohar
Browse files
Options

various bug fixing in QC generation and auto backflush 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@93691 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 2fecabb6
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 24 deletions
webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java
View file @ 564e5b53
...@@ -972,7 +972,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -972,7 +972,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
int formLineNo = 0, updCnt = 0, count = 0; int formLineNo = 0, updCnt = 0, count = 0;
double ct3Quantity = 0, qtyUsed = 0,bondTaxAmount = 0,bondValue = 0,bankGuarantee = 0,exShtQtystd = 0; double ct3Quantity = 0, qtyUsed = 0,bondTaxAmount = 0,bondValue = 0,bankGuarantee = 0,exShtQtystd = 0;
ArrayList suppLockList = new ArrayList(); ArrayList suppLockList = new ArrayList(), qtyAr = null;
ArrayList itemLockList = null,tempList = null; ArrayList itemLockList = null,tempList = null;
HashMap lockCodeWiseMap = new HashMap(), tempMap = null; HashMap lockCodeWiseMap = new HashMap(), tempMap = null;
String lockGroup = "", lockCode = "", tempLockGroup = "",tempLockCode ="",qcReqd = "N", tempTranId = ""; String lockGroup = "", lockCode = "", tempLockGroup = "",tempLockCode ="",qcReqd = "N", tempTranId = "";
...@@ -1497,15 +1497,19 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -1497,15 +1497,19 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
if (exShtQty != 0) if (exShtQty != 0)
{ {
//Sharon 12-Sep-2003 //Sharon 12-Sep-2003
if ( "Q".equals(uomRound) || "B".equals(uomRound)) /*if ( "Q".equals(uomRound) || "B".equals(uomRound))
{ {
stdQuantity = distCommon.convQtyFactor(unit,stdUom, itemCode, quantity + exShtQty, conn); stdQuantity = distCommon.convQtyFactor(unit,stdUom, itemCode, quantity + exShtQty, conn);
} }
else else
{ {
stdQuantity = distCommon.convQtyFactor(unit,stdUom, itemCode, quantity + exShtQty, conn); stdQuantity = distCommon.convQtyFactor(unit,stdUom, itemCode, quantity + exShtQty, conn);
} }*/
//End Sharon //End Sharon
qtyAr = distCommon.getConvQuantityFact(unit, stdUom, itemCode, quantity + exShtQty, convQtyStdUom, conn);
convQtyStdUom = Double.parseDouble( qtyAr.get(0).toString() );
stdQuantity = Double.parseDouble( qtyAr.get(1).toString() );
//stdQuantity = gf_conv_qty_fact(unit,stdUom, itemCode, quantity + exShtQty, convQtyStdUom) //stdQuantity = gf_conv_qty_fact(unit,stdUom, itemCode, quantity + exShtQty, convQtyStdUom)
//added by jasmina DI89ALL024-17/07/09 //added by jasmina DI89ALL024-17/07/09
...@@ -1651,7 +1655,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -1651,7 +1655,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
if ( rs1.next() ) if ( rs1.next() )
{ {
invStat = rs1.getString("status"); invStat = rs1.getString("inv_stat");
} }
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
...@@ -2892,6 +2896,22 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -2892,6 +2896,22 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1.close(); pstmt1.close();
pstmt1 = null; pstmt1 = null;
if(itemSer == null || itemSer.trim().length() == 0)
{
sql = "SELECT ITEM_SER FROM ITEM WHERE ITEM_CODE = ?";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, itemCode);
rs1 = pstmt1.executeQuery();
if ( rs1.next() )
{
itemSer = checkNull(rs1.getString("ITEM_SER"));
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
}
if ( procMth != null && procMth.trim().length() > 0 ) if ( procMth != null && procMth.trim().length() > 0 )
{ {
qtySample = 0.0; qtySample = 0.0;
...@@ -2920,8 +2940,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -2920,8 +2940,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{ {
lineNo = checkNull(rs1.getString("LINE_NO")); lineNo = checkNull(rs1.getString("LINE_NO"));
locCode = checkNull(rs1.getString("LOC_CODE")); locCode = checkNull(rs1.getString("LOC_CODE"));
lotNoRcp = checkNull(rs1.getString("LOT_NO")); lotNoRcp = (rs1.getString("LOT_NO"));
lotSl = checkNull(rs1.getString("LOT_SL")); lotSl = (rs1.getString("LOT_SL"));
qty = rs1.getDouble(5); qty = rs1.getDouble(5);
convQty = rs1.getDouble("CONV__QTY_STDUOM"); convQty = rs1.getDouble("CONV__QTY_STDUOM");
unit = checkNull(rs1.getString("UNIT__STD")); unit = checkNull(rs1.getString("UNIT__STD"));
...@@ -2929,8 +2949,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -2929,8 +2949,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
expiryDate = rs1.getTimestamp("EXPIRY_DATE") ; expiryDate = rs1.getTimestamp("EXPIRY_DATE") ;
purcOrder = checkNull(rs1.getString("PURC_ORDER")); purcOrder = checkNull(rs1.getString("PURC_ORDER"));
lineNoOrd = checkNull(rs1.getString("LINE_NO__ORD")); lineNoOrd = checkNull(rs1.getString("LINE_NO__ORD"));
unitPur = checkNull(rs1.getString("UNIT")); unitPur = (rs1.getString("UNIT"));
spec = checkNull(rs1.getString("SPEC_REF")); spec = (rs1.getString("SPEC_REF"));
mfgDate = rs1.getTimestamp("MFG_DATE") ; mfgDate = rs1.getTimestamp("MFG_DATE") ;
//added by kunal on 5/11/12 start as per Pravin Sali Sir instruction //added by kunal on 5/11/12 start as per Pravin Sali Sir instruction
excessShortQty = rs1.getDouble("EXCESS_SHORT_QTY"); //added by Kunal on 5/11/12 excessShortQty = rs1.getDouble("EXCESS_SHORT_QTY"); //added by Kunal on 5/11/12
...@@ -2949,9 +2969,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -2949,9 +2969,12 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
//if ( "Q".equalsIgnoreCase(value) || "B".equalsIgnoreCase(value) ) //if ( "Q".equalsIgnoreCase(value) || "B".equalsIgnoreCase(value) )
//{ //{
//qty = gf_conv_qty_fact1(ls_unitpur, ls_unit, ls_itemcode, lc_Qty, lc_convqty,'Y') //qty = gf_conv_qty_fact1(ls_unitpur, ls_unit, ls_itemcode, lc_Qty, lc_convqty,'Y')
System.out.println("before qty ["+ qty + "]");
qtyAr = distCommon.getConvQuantityFact(unitPur, unit, itemCode, qty, convQty, conn); qtyAr = distCommon.getConvQuantityFact(unitPur, unit, itemCode, qty, convQty, conn);
convQty = Double.parseDouble( qtyAr.get(0).toString() ); convQty = Double.parseDouble( qtyAr.get(0).toString() );
qty = Double.parseDouble( qtyAr.get(1).toString() ); qty = Double.parseDouble( qtyAr.get(1).toString() );
System.out.println("after qty ["+qty + "]");
//} //}
//else //else
//{ //{
...@@ -3211,15 +3234,15 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -3211,15 +3234,15 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
rs1 = pstmt1.executeQuery(); rs1 = pstmt1.executeQuery();
while ( rs1.next() ) while ( rs1.next() )
{ {
batchNo = checkNull(rs1.getString(1)); batchNo = rs1.getString(1);
locCode = checkNull(rs1.getString(2)); locCode = rs1.getString(2);
unit = checkNull(rs1.getString(3)); unit = rs1.getString(3);
qty = rs1.getDouble(4); qty = rs1.getDouble(4);
lineNo = checkNull(rs1.getString(5)); lineNo = checkNull(rs1.getString(5));
spec = checkNull(rs1.getString(8)); spec = rs1.getString(8);
mfgDate = rs1.getTimestamp(6); mfgDate = rs1.getTimestamp(6);
lotNoRcp = checkNull(rs1.getString(7)); lotNoRcp = rs1.getString(7);
//added by kunal on 5/11/12 start as per Pravin Sali Sir instruction //added by kunal on 5/11/12 start as per Pravin Sali Sir instruction
excessShortQty = rs1.getDouble("excess_short_qty"); //added by Kunal on 5/11/12 excessShortQty = rs1.getDouble("excess_short_qty"); //added by Kunal on 5/11/12
quantityStduom = rs1.getDouble("quantity__stduom"); //added by Kunal on 5/11/12 quantityStduom = rs1.getDouble("quantity__stduom"); //added by Kunal on 5/11/12
...@@ -3231,7 +3254,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -3231,7 +3254,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
qty = quantityStduom; qty = quantityStduom;
} }
//added by kunal on 5/11/12 end as per Pravin Sali Sir instruction //added by kunal on 5/11/12 end as per Pravin Sali Sir instruction
suppCodeMnfr = checkNull(rs1.getString("supp_code__mnfr"));//added by Kunal on 8/11/12 suppCodeMnfr = rs1.getString("supp_code__mnfr");//added by Kunal on 8/11/12
System.out.println("suppCodeMnfr = "+suppCodeMnfr); System.out.println("suppCodeMnfr = "+suppCodeMnfr);
sql = "SELECT PURC_ORDER, LINE_NO__ORD, EXPIRY_DATE , LOT_SL , LINE_NO, MFG_DATE FROM PORCPDET WHERE TRAN_ID = ? AND ITEM_CODE = ? AND LOC_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ?"; sql = "SELECT PURC_ORDER, LINE_NO__ORD, EXPIRY_DATE , LOT_SL , LINE_NO, MFG_DATE FROM PORCPDET WHERE TRAN_ID = ? AND ITEM_CODE = ? AND LOC_CODE = ? AND (CASE WHEN BATCH_NO IS NULL THEN ' ' ELSE BATCH_NO END) = ?";
...@@ -4508,6 +4531,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4508,6 +4531,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
System.out.println(" in for Loop="); System.out.println(" in for Loop=");
itemCodeDet = genericUtility.getColumnValueFromNode("item_code", detlList.item(cntr) ); itemCodeDet = genericUtility.getColumnValueFromNode("item_code", detlList.item(cntr) );
qtyDet =Double.parseDouble(genericUtility.getColumnValueFromNode("quantity", detlList.item(cntr))); qtyDet =Double.parseDouble(genericUtility.getColumnValueFromNode("quantity", detlList.item(cntr)));
chkQty = 0;
setRow = 1; setRow = 1;
distIssTid =distIss; distIssTid =distIss;
...@@ -4579,10 +4603,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -4579,10 +4603,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
pstmt1 = null; pstmt1 = null;
rs1.close(); rs1.close();
rs1 = null; rs1 = null;
System.out.println("Issued stock is not sufficientto get other available stock qtyDet [" + qtyDet + "] chkQty [" + chkQty + "]");
if ( qtyDet > chkQty ) if ( qtyDet > chkQty || chkQty == 0)
{ {
sql = "SELECT (CASE WHEN STOCK.QUANTITY IS NULL THEN 0 ELSE STOCK.QUANTITY END) - (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END) - (CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END), STOCK.UNIT, STOCK.LOC_CODE, STOCK.LOT_NO, STOCK.LOT_SL, STOCK.RATE FROM STOCK,LOCATION,INVSTAT WHERE STOCK.LOC_CODE = LOCATION.LOC_CODE AND ((CASE WHEN STOCK.QUANTITY IS NULL THEN 0 ELSE STOCK.QUANTITY END) - (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END)-(CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END)) > 0 AND LOCATION.INV_STAT = INVSTAT.INV_STAT AND STOCK.SITE_CODE = ? AND STOCK.ITEM_CODE = ? AND (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END) >= 0 AND INVSTAT.AVAILABLE = ? AND STOCK.LOT_NO NOT IN (SELECT LOT_NO FROM DISTORD_ISSDET WHERE DISTORD_ISSDET.TRAN_ID = ? AND DISTORD_ISSDET.ITEM_CODE = ? )ORDER BY STOCK.PARTIAL_USED, (CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END),STOCK.CREA_DATE, STOCK.LOT_NO, STOCK.LOT_SL "; sql = "SELECT (CASE WHEN STOCK.QUANTITY IS NULL THEN 0 ELSE STOCK.QUANTITY END) - (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END) - (CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END), STOCK.UNIT, STOCK.LOC_CODE, STOCK.LOT_NO, STOCK.LOT_SL, STOCK.RATE FROM STOCK,LOCATION,INVSTAT WHERE STOCK.LOC_CODE = LOCATION.LOC_CODE AND ((CASE WHEN STOCK.QUANTITY IS NULL THEN 0 ELSE STOCK.QUANTITY END) - (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END)-(CASE WHEN STOCK.HOLD_QTY IS NULL THEN 0 ELSE STOCK.HOLD_QTY END)) > 0 AND LOCATION.INV_STAT = INVSTAT.INV_STAT AND STOCK.SITE_CODE = ? AND STOCK.ITEM_CODE = ? AND (CASE WHEN STOCK.ALLOC_QTY IS NULL THEN 0 ELSE STOCK.ALLOC_QTY END) >= 0 AND INVSTAT.AVAILABLE = ? AND STOCK.LOT_NO NOT IN (SELECT LOT_NO FROM DISTORD_ISSDET WHERE DISTORD_ISSDET.TRAN_ID = ? AND DISTORD_ISSDET.ITEM_CODE = ? ) ORDER BY STOCK.PARTIAL_USED, (CASE WHEN STOCK.EXP_DATE IS NULL THEN STOCK.CREA_DATE ELSE STOCK.EXP_DATE END),STOCK.CREA_DATE, STOCK.LOT_NO, STOCK.LOT_SL ";
pstmt1 = conn.prepareStatement(sql); pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1, sordSite ); pstmt1.setString(1, sordSite );
pstmt1.setString(2, itemCodeDet ); pstmt1.setString(2, itemCodeDet );
...@@ -6672,10 +6696,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp ...@@ -6672,10 +6696,10 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
{ {
input = ""; input = "";
} }
else /*else
{ {
input = input.trim(); input = input.trim();
} }*/
return input; return input;
} }
......
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