Skip to content

B
business-java
Commit 896df56e authored by wansari's avatar wansari
Browse files
Options

merged for ibase3-webitm-wms25-2-1-27 branch relaese 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@102577 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 1c0b86ee
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 53 deletions
webitm-wms/ibase/webitm/ejb/wms/PalletOutPos.java
View file @ 896df56e
......@@ -284,7 +284,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
if(countDso == 0)
{
sql = "SELECT D.TRAN_ID,D.ITEM_CODE,D.LINE_NO,S.QUANTITY,D.LOT_NO,D.LOT_SL,D.LOC_CODE,H.SITE_CODE,S.ALLOC_QTY,D.NO_ART"
sql = "SELECT D.TRAN_ID,D.ITEM_CODE,D.LINE_NO,S.QUANTITY,D.LOT_NO,D.LOT_SL,D.LOC_CODE,H.SITE_CODE,S.ALLOC_QTY,D.NO_ART,"
+" S.ACCT_CODE__INV,S.CCTR_CODE__INV"
+" FROM DISTORD_ISSDET D,DISTORD_ISS H,STOCK S "
+" WHERE D.TRAN_ID = H.TRAN_ID AND H.CONFIRMED = 'N' AND D.DIST_ORDER = ? AND D.LINE_NO = ? AND D.QUANTITY > 0 "
+" AND S.LOC_CODE = D.LOC_CODE AND S.LOT_NO = D.LOT_NO"
......@@ -293,21 +294,24 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
else
{
sql = " SELECT D.QTY_ALLOC,D.SITE_CODE__MFG,D.QUANTITY AS DIST_QTY,DT.LINE_NO AS LINE_NO_DIST,"
+" H.SITE_CODE,H.TRAN_TYPE,DT.TAX_CLASS,DT.TAX_CHAP,DT.TAX_ENV,"
//+" H.SITE_CODE,H.TRAN_TYPE,DT.TAX_CLASS,DT.TAX_CHAP,DT.TAX_ENV,"//Changed site code ship on 15-07-2016
+" H.SITE_CODE__SHIP AS SITE_CODE,H.TRAN_TYPE,DT.TAX_CLASS,DT.TAX_CHAP,DT.TAX_ENV,"
+" S.ITEM_CODE,S.LOT_NO,S.LOT_SL,S.QUANTITY,S.ALLOC_QTY,S.EXP_DATE, S.UNIT,S.UNIT__ALT,S.ITEM_SER, S.MFG_DATE,S.NO_ART,"
+" S.POTENCY_PERC, S.PACK_CODE, S.LOC_CODE, S.BATCH_NO, S.GRADE , S.GROSS_WEIGHT, S.TARE_WEIGHT, "
+" S.NET_WEIGHT, S.DIMENSION, S.RETEST_DATE, S.SUPP_CODE__MFG, S.PACK_INSTR,S.RATE "
+" S.NET_WEIGHT, S.DIMENSION, S.RETEST_DATE, S.SUPP_CODE__MFG, S.PACK_INSTR,S.RATE,"
+" S.ACCT_CODE__INV,S.CCTR_CODE__INV,DT.RATE__CLG,DT.QTY_CONFIRM,DT.QTY_SHIPPED "
+" FROM DISTORDER_ALLOC D,DISTORDER H,DISTORDER_DET DT,STOCK S "
//+" WHERE D.DIST_ORDER = ? AND D.LINE_NO = ? AND S.QUANTITY > 0 "
+" WHERE D.DIST_ORDER = ? AND (D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ?) AND D.LINE_NO = ? AND S.QUANTITY > 0 "
+" AND D.DIST_ORDER = H.DIST_ORDER AND H.DIST_ORDER = DT.DIST_ORDER AND D.LINE_NO = DT.LINE_NO AND"
+" D.LOT_NO = S.LOT_NO AND D.LOT_SL = S.LOT_SL AND D.ITEM_CODE = S.ITEM_CODE AND D.LOC_CODE = S.LOC_CODE"
+" AND S.SITE_CODE = H.SITE_CODE ";
+" AND S.SITE_CODE = H.SITE_CODE__SHIP ";
}
}
else if("S-ORD".equalsIgnoreCase(refSer))
{
sql = "SELECT S.ITEM_CODE,D.LINE_NO,S.QUANTITY,S.ALLOC_QTY,D.QTY_ALLOC,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.SITE_CODE,S.NO_ART"
sql = "SELECT S.ITEM_CODE,D.LINE_NO,S.QUANTITY,S.ALLOC_QTY,D.QTY_ALLOC,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.SITE_CODE,S.NO_ART,"
+" S.ACCT_CODE__INV,S.CCTR_CODE__INV "
+" FROM SORDALLOC D,SORDER H,STOCK S "
//+" WHERE D.SALE_ORDER = ? AND D.LINE_NO = ? AND S.QUANTITY > 0"
+" WHERE D.SALE_ORDER = ? AND (D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ? OR D.LOC_CODE = ?) AND D.LINE_NO = ? AND S.QUANTITY > 0"
......@@ -317,7 +321,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
}
else if("PR".equalsIgnoreCase(refSer))
{
sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.ALLOC_QTY,P.NO_ART,"
sql = "SELECT S.ITEM_CODE,S.QUANTITY,S.LOT_NO,S.LOT_SL,S.LOC_CODE,S.ALLOC_QTY,P.NO_ART,"
+" S.ACCT_CODE__INV,S.CCTR_CODE__INV, "
+" S.SITE_CODE FROM STOCK S,PALLET_REQ_DET P WHERE"
+" P.TRAN_ID = ? AND P.LINE_NO = ? AND"
+" (S.LOC_CODE = P.PALLET_NO OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ? OR S.LOC_CODE = ?) "
......@@ -325,7 +330,8 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
}
else if("PRS".equalsIgnoreCase(refSer))
{
sql = "SELECT P.ITEM_CODE,S.QUANTITY,P.LOT_NO,P.LOT_SL,S.LOC_CODE,H.SITE_CODE,S.ALLOC_QTY,P.NO_ART"
sql = "SELECT P.ITEM_CODE,S.QUANTITY,P.LOT_NO,P.LOT_SL,S.LOC_CODE,H.SITE_CODE,S.ALLOC_QTY,P.NO_ART,"
+" S.ACCT_CODE__INV,S.CCTR_CODE__INV "
+" FROM PALLET_REQ_DET P,STOCK S,PALLET_REQ_HDR H WHERE P.TRAN_ID = ? AND P.LINE_NO = ?"
+" AND P.TRAN_ID = H.TRAN_ID AND P.ITEM_CODE = S.ITEM_CODE"
//+" AND H.SITE_CODE = S.SITE_CODE AND (P.PALLET_NO = S.LOC_CODE OR S.LOC_CODE = ? )"
......@@ -371,7 +377,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
}
System.out.println("Line number is ["+lineNoInterface+"]Loc Code From ["+locCodeFrom+"]");
if(headerFlag)
/*if(headerFlag)
{
insertSql = "INSERT INTO STOCK_TRANSFER(TRAN_ID,TRAN_DATE,SITE_CODE,REF_SER__FOR,REF_ID__FOR,"+
"REAS_CODE,ITEM_SER,CONFIRMED,"+
......@@ -394,7 +400,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
updCnt = pstmtHdr.executeUpdate();
pstmtHdr.close();
pstmtHdr = null;
}
}*/
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
......@@ -436,6 +442,36 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
rs = pstmt.executeQuery();
while(rs.next())
{
siteCode = checkNullAndTrim(rs.getString("SITE_CODE"));
System.out.println("Stock allocation site code ["+siteCode+"] Header Flag["+headerFlag+"]");
//Changed by wasim on 15-07-2016 to set stock allocated site code in stock_transfer header [START]
if(headerFlag)
{
insertSql = "INSERT INTO STOCK_TRANSFER(TRAN_ID,TRAN_DATE,SITE_CODE,REF_SER__FOR,REF_ID__FOR,"+
"REAS_CODE,ITEM_SER,CONFIRMED,"+
"EMP_CODE__APRV,CHG_DATE,CHG_TERM,CHG_USER) "+
"VALUES(?,?,?,?,?,?,?,?,?,?,?,?)";
pstmtHdr = conn.prepareStatement(insertSql);
tranID = generateTranTd("w_stock_transfer", currDateStr, siteCode, conn);
pstmtHdr.setString( 1, tranID );
pstmtHdr.setTimestamp( 2, currDate );
pstmtHdr.setString( 3, siteCode );
pstmtHdr.setString( 4, "XFRX");
pstmtHdr.setString( 5, refId );
pstmtHdr.setString( 6, "" );
pstmtHdr.setString( 7, "" );
pstmtHdr.setString( 8, "N" );
pstmtHdr.setString( 9, "" );
pstmtHdr.setTimestamp( 10, currDate );
pstmtHdr.setString( 11, chgTerm );
pstmtHdr.setString( 12, userId );
updCnt = pstmtHdr.executeUpdate();
pstmtHdr.close();
pstmtHdr = null;
}
//Changed by wasim on 15-07-2016 to set stock allocated site code in stock_transfer header [END]
lineNoList.add(lineNoInterface);
isRecordExist = true;
......@@ -443,12 +479,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
quantity = rs.getDouble("QUANTITY");
lotNo = checkNullAndTrim(rs.getString("LOT_NO"));
lotSl = checkNullAndTrim(rs.getString("LOT_SL"));
siteCode = checkNullAndTrim(rs.getString("SITE_CODE"));
noArt = checkNullAndTrim(rs.getString("NO_ART"));
locCodeFrom = checkNullAndTrim(rs.getString("LOC_CODE"));
allocQty = rs.getDouble("ALLOC_QTY");
acctCodeInv = checkNullAndTrim(rs.getString("ACCT_CODE__INV"));
cctrCodeInv = checkNullAndTrim(rs.getString("CCTR_CODE__INV"));
if(countDso > 0 && "D-SO".equalsIgnoreCase(refSer))
{
distOrderAlloc = rs.getDouble("QTY_ALLOC");
......@@ -528,6 +565,10 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
hashMap1.put("tax_chap", rs.getString("TAX_CHAP"));
hashMap1.put("tax_env", rs.getString("TAX_ENV"));
hashMap1.put("loc_code__to", locCodeTo);
hashMap1.put("rate__clg", rs.getDouble("RATE__CLG" ));//added rate clg on 15-07-2016
hashMap1.put("qty_shipped", rs.getDouble("QTY_SHIPPED" ));//added rate by wasim on 15-07-2016
hashMap1.put("qty_confirm", rs.getDouble("QTY_CONFIRM"));//added rate by wasim on 15-07-2016
DistStkList.add(hashMap1);
}
if("S-ORD".equalsIgnoreCase(refSer))
......@@ -669,7 +710,9 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
conn.commit();
System.out.println("Going for Distribution issue");
errString = createDistIssue(loginSiteCode, refId, DistStkList, xtraParams, conn);
//Changed by wasim to change site code as stock allocated site code
//errString = createDistIssue(loginSiteCode, refId, DistStkList, xtraParams, conn);
errString = createDistIssue(siteCode, refId, DistStkList, xtraParams, conn);
System.out.println("Return from dist issue"+errString);
if( errString != null && (errString.indexOf( "Success" ) > -1 || errString.indexOf( "VTCONPARM" ) > -1))//VTCONPARM
......@@ -1194,6 +1237,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
taxChap = checkNullAndTrim((String) stkMap.get("tax_chap"));
taxEnv = checkNullAndTrim((String) stkMap.get("tax_env"));
locCode = checkNullAndTrim((String) stkMap.get("loc_code__to"));
rateClg = Double.toString((Double) stkMap.get("rate__clg"));//added by wasim to get rate clg from distorder det
qtyConfirm = (Double) stkMap.get("qty_confirm");//added by wasim
qtyShipped = (Double) stkMap.get("qty_shipped");//added by wasim
remQuantity = qtyConfirm - qtyShipped;
StringBuffer xmldetail2hdr = new StringBuffer();
xmldetail2hdr.append("<Detail2 dbID=\"\" domID=\"1\" objName=\"dist_order_post\" objContext=\"2\">");
......@@ -1207,7 +1255,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
xmldetail2hdr.append("<tax_class><![CDATA[" + taxClass + "]]></tax_class>");
xmldetail2hdr.append("<tax_chap><![CDATA[" + taxChap + "]]></tax_chap>");
xmldetail2hdr.append("<tax_env><![CDATA[" + taxEnv + "]]></tax_env>");
sql = " SELECT (CASE WHEN ACTIVE IS NULL THEN 'Y' ELSE ACTIVE END) ACT, MIN_SHELF_LIFE, (CASE WHEN TRACK_SHELF_LIFE IS NULL THEN 'N' ELSE TRACK_SHELF_LIFE END) TRK_SHELF_LIFE, (CASE WHEN SUPP_SOUR IS NULL THEN 'M' ELSE SUPP_SOUR END) SUP_SOUR, DESCR FROM ITEM WHERE ITEM_CODE = '" +
itemCode + "' ";
pstmt1 = conn.prepareStatement(sql);
......@@ -1242,15 +1290,52 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
}
rs1.close();rs1 = null;
pstmt1.close();pstmt1 = null;
//stockQty = quantity - allocQty;
rate1 = rate;
if (rate1.equals(""))
{
rate1 = "0";
}
System.out.println("rate1----" + rate1 + "---priceList----" + priceList);
minputQty = quantity;
//Changed########### by wasim on 15-07-2016 [START]
if (tranType != null && tranType.trim().length() > 0)
{
sql = "SELECT CHECK_INTEGRAL_QTY, TRAN_TYPE__PARENT FROM DISTORDER_TYPE WHERE TRAN_TYPE = '"+tranType+"' ";
pstmt1 = conn.prepareStatement(sql);
rs1 = pstmt1.executeQuery();
if (rs1.next())
{
checkIntegralQty = rs1.getString( 1 );
tranTypeParent = rs1.getString( 2 );
if (checkIntegralQty == null || checkIntegralQty.trim().length() == 0)
{
checkIntegralQty = "Y";
}
}
rs1.close();
rs1 = null;
pstmt1.close();
pstmt1 = null;
}
if (!checkIntegralQty.equals("N"))
{
integralQty = getIntegralQty( siteCode, itemCode, lotNo, packCode, checkIntegralQty );
System.out.println("Integral quantiity"+integralQty);
if (integralQty <= 0)
{
errCode = "VINTGRLQTY";
errString = itmDBAccessEJB.getErrorString( "", errCode, "", "", conn);
return errString;
}
}
rate1 = rate;
if (rate1.equals(""))
{
rate1 = "0";
}
System.out.println("rate1----"+rate1+"---priceList----"+priceList);
//#########Changed by wasim on 15-07-2016 [END]
if (Double.parseDouble(rate1) == 0.0D)
{
if ((priceList != null) && (priceList.trim().length() > 0))
......@@ -1285,23 +1370,43 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
rate1 = Double.toString(rate2);
}
System.out.println("My quantity="+quantity);
if (quantity > 0.0D)
//Changed by wasim on 15-07-2016for rate clg [START]
if (priceListClg != null && priceListClg.trim().length() > 0 )
{
//rateClgVal = distComm.pickRate(priceListClg, tranDate, itemCode, rs1.getString(1),"D",conn);
rateClgVal = distComm.pickRate(priceListClg, tranDate, itemCode, lotNo,"D",conn);
System.out.println("rateClgVal----"+rateClgVal);
if (rateClgVal <= 0)
{
rateClgVal = Double.parseDouble(rate);
}
}
else
{
rateClgVal= Double.parseDouble(rateClg);
}
System.out.println("@@Final rate clg="+rateClgVal);
//Changed by wasim on 15-07-2016for rate clg [START]
System.out.println("My quantity="+minputQty);
if (minputQty > 0.0D)
{
grossPer = grossWt / quantity;
netPer = netWt / quantity;
tarePer = tareWt / quantity;
grossPer = grossWt / minputQty;
netPer = netWt / minputQty;
tarePer = tareWt / minputQty;
grossWt = quantity * grossPer;
netWt = quantity * netPer;
tareWt = quantity * tarePer;
grossWt = minputQty * grossPer;
netWt = minputQty * netPer;
tareWt = minputQty * tarePer;
}
disAmount = amount * (discount / 100.0D);
noArt1 = 0;
//noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, minputQty, 'B', shipperQty, integralQty);
noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, quantity, 'B', shipperQty, integralQty);
noArt1 = 0;
noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, minputQty, 'B', shipperQty, integralQty);
//noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, quantity, 'B', shipperQty, integralQty);
noArt = noArt1;
System.out.println("%^%^%^%^%^%NoArt is&***&*&*&*&[" + noArt + "]");
......@@ -1325,11 +1430,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
if (shipperSize > 0.0D)
{
shipQty = shipperSize;
//noArt11 = (minputQty - minputQty % shipQty) / shipQty;
noArt11 = (quantity - quantity % shipQty) / shipQty;
noArt11 = (minputQty - minputQty % shipQty) / shipQty;
//noArt11 = (quantity - quantity % shipQty) / shipQty;
System.out.println("noArt11 .............:" + noArt11);
//remainder = minputQty % shipQty;
remainder = quantity % shipQty;
remainder = minputQty % shipQty;
//remainder = quantity % shipQty;
System.out.println("remainder .............:" + remainder);
sql = "select ( case when integral_qty is null then 0 else integral_qty end) integral_qty from customeritem where cust_code = '" +
sundryCode + "' and item_code ='" + itemCode + "'";
......@@ -1383,16 +1488,16 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
}
if (shipperSize == 0.0D)
{
//noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, minputQty, 'B', acShipperQty, acIntegralQty);
noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, quantity, 'B', acShipperQty, acIntegralQty);
noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, minputQty, 'B', acShipperQty, acIntegralQty);
//noArt1 = getNoArt(siteCode, sundryCode, itemCode, packCode, quantity, 'B', acShipperQty, acIntegralQty);
noArt = noArt1;
}
lcFact = 0.0D;
ArrayList QtyFactorList = new ArrayList();
//QtyFactorList = distComm.convQtyFactor(unitAlt, unit, itemCode, minputQty, lcFact, conn);
QtyFactorList = distComm.convQtyFactor(unitAlt, unit, itemCode, quantity, lcFact, conn);
QtyFactorList = distComm.convQtyFactor(unitAlt, unit, itemCode, minputQty, lcFact, conn);
//QtyFactorList = distComm.convQtyFactor(unitAlt, unit, itemCode, quantity, lcFact, conn);
lcQtyOrderAlt = ((Double)QtyFactorList.get(1)).doubleValue();
lcFact = ((Double)QtyFactorList.get(0)).doubleValue();
System.out.println("List receved="+QtyFactorList);
......@@ -1416,7 +1521,7 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
xmldetail2stock.append("<loc_code>").append("<![CDATA[").append(tLocCode == null ? "" : tLocCode.trim()).append("]]>").append("</loc_code>\r\n");
xmldetail2stock.append("<rate>").append("<![CDATA[").append(rate).append("]]>").append("</rate>\r\n");
xmldetail2stock.append("<rate__clg>").append("<![CDATA[").append(rateClg).append("]]>").append("</rate__clg>\r\n");
xmldetail2stock.append("<rate__clg>").append("<![CDATA[").append(rateClgVal).append("]]>").append("</rate__clg>\r\n");
xmldetail2stock.append("<quantity>").append("<![CDATA[").append(quantity).append("]]>").append("</quantity>\r\n");
xmldetail2stock.append("<amount>").append("<![CDATA[").append(quantity * Double.parseDouble(rate1)).append("]]>").append("</amount>\r\n");
String tLotSl = null;
......@@ -1519,15 +1624,11 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
String sql = "";
ResultSet rs = null;
Connection conn = null;
//Commented by Santosh on 14-06-2016
//ConnDriver connDriver = new ConnDriver();
ConnDriver connDriver = new ConnDriver();
Statement stmt = null;
try
{
//Changed and Commented By Santosh on 14-06-2016 :[START]
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changed and Commented By Santosh on 14-06-2016 :[END]
conn = connDriver.getConnectDB("DriverITM");
stmt = conn.createStatement();
char type = checkIntegralQty.charAt(0);
......@@ -2015,17 +2116,13 @@ public class PalletOutPos extends ValidatorEJB implements PalletOutPosLocal, Pal
String sql = "";
ResultSet rs = null;
Connection conn = null;
//Commented by Santosh on 14-06-2016
//ConnDriver connDriver = new ConnDriver();
ConnDriver connDriver = new ConnDriver();
Statement stmt = null;
double reoQty = 0.0D; double capacity = 0.0D; double integralQty = 0.0D; double mod = 0.0D; double noArt3 = 0.0D;
double noArt = 0.0D; double noArt1 = 0.0D; double noArt2 = 0.0D;
try
{
//Changed and Commented By Santosh on 14-06-2016 :[START]
//conn = connDriver.getConnectDB("DriverITM");
conn = getConnection();
//Changed and Commented By Santosh on 14-06-2016 :[END]
conn = connDriver.getConnectDB("DriverITM");
stmt = conn.createStatement();
System.out.println("type :" + type);
switch (type)
......
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