Skip to content

B
business-java
Commit af3b44db authored by msingh's avatar msingh
Browse files
Options

Changed by Manish on 08/06/16 for DDUK 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@101789 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 409c42c7
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 14 deletions
webitm-wms/ibase/webitm/ejb/wms/DeallocArtConf.java
View file @ af3b44db
......@@ -100,7 +100,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
HashMap replIss = new HashMap();
Set ptcnSET = new HashSet(); //
ITMDBAccessEJB itmdbAccess = new ITMDBAccessEJB();
HashMap pickInfoMap = new HashMap();
try
{
conn.setAutoCommit(false);
......@@ -231,7 +231,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
while (rs.next())
{
//sorderDeAllocate(saleOrder, lineNo, itemCode, DeallocQty, expLev, custCode, lotSl, lotNo, locCode, tranId, allocLineno)
saleOrder = rs.getString("SALE_ORDER");
/*saleOrder = rs.getString("SALE_ORDER");
saleOrderLine = rs.getString("LINE_NO__SORD");
itemCode = rs.getString("ITEM_CODE");
custCode = rs.getString("CUST_CODE");
......@@ -251,12 +251,54 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
//changed by sankara on 13/06/2013
unit = rs.getString("UNIT");
standardUnit = rs.getString("UNIT__STD");
convQtyStduom = rs.getDouble("CONV__QTY_STDUOM");
convQtyStduom = rs.getDouble("CONV__QTY_STDUOM");*/
pickInfoMap.put("SALE_ORDER", rs.getString("SALE_ORDER"));
pickInfoMap.put("LINE_NO__SORD", rs.getString("LINE_NO__SORD"));
pickInfoMap.put("ITEM_CODE", rs.getString("ITEM_CODE"));
pickInfoMap.put("CUST_CODE", rs.getString("CUST_CODE"));
pickInfoMap.put("EXP_LEV", rs.getString("EXP_LEV"));
pickInfoMap.put("LOT_SL", rs.getString("LOT_SL"));
pickInfoMap.put("LOT_NO", rs.getString("LOT_NO"));
pickInfoMap.put("LOC_CODE", rs.getString("LOC_CODE"));
pickInfoMap.put("LOC_CODE__TO", rs.getString("LOC_CODE__TO"));
pickInfoMap.put("QUANTITY", rs.getDouble("QUANTITY"));
pickInfoMap.put("WAVE_ID", rs.getString("WAVE_ID"));
pickInfoMap.put("PICK_ORDER", rs.getString("PICK_ORDER"));
pickInfoMap.put("LINE_NO__PICK", rs.getInt("LINE_NO__PICK"));
pickInfoMap.put("PICK_TYPE", rs.getString("PICK_TYPE"));
pickInfoMap.put("CARTON_NO", rs.getString("CARTON_NO"));
pickInfoMap.put("PTCN", rs.getString("PTCN"));
pickInfoMap.put("UNIT", rs.getString("UNIT"));
pickInfoMap.put("UNIT__STD", rs.getString("UNIT__STD"));
pickInfoMap.put("CONV__QTY_STDUOM", rs.getDouble("CONV__QTY_STDUOM"));
saleOrder = (String)pickInfoMap.get("SALE_ORDER");
saleOrderLine = (String)pickInfoMap.get("LINE_NO__SORD");
itemCode = (String)pickInfoMap.get("ITEM_CODE");
custCode = (String)pickInfoMap.get("CUST_CODE");
expLev = (String)pickInfoMap.get("EXP_LEV");
lotSl = (String)pickInfoMap.get("LOT_SL");
lotNo = (String)pickInfoMap.get("LOT_NO");
locCode = (String)pickInfoMap.get("LOC_CODE");
locCodeTo = (String)pickInfoMap.get("LOC_CODE__TO");
DeallocQty = (Double)pickInfoMap.get("QUANTITY");
waveId = (String)pickInfoMap.get("WAVE_ID");
pickOrder = (String)pickInfoMap.get("PICK_ORDER");
pickLineNo = (Integer)pickInfoMap.get("LINE_NO__PICK");
pPickType = (String)pickInfoMap.get("PICK_TYPE");
cartonNo = (String)pickInfoMap.get("CARTON_NO");
ptcn = (String)pickInfoMap.get("PTCN");
unit = (String)pickInfoMap.get("UNIT");
standardUnit = (String)pickInfoMap.get("UNIT__STD");
convQtyStduom = (Double)pickInfoMap.get("CONV__QTY_STDUOM");
ptcnSET.add(ptcn);
saleOrderLine = " " + saleOrderLine;
saleOrderLine = saleOrderLine.substring(saleOrderLine.length()-3);
System.out.println(" sord line no ["+saleOrderLine+"] locCode ["+locCode+"] locCodeTo["+locCodeTo+"] pickLineNo ["+pickLineNo+"] ptcn ["+ptcn+"]");
if("S".equalsIgnoreCase(pPickType))
{
errString = deallocatedRepl(pickOrder, pickLineNo,pPickType, siteCode, itemCode, lotNo, lotSl, DeallocQty, saleOrder, saleOrderLine, expLev, custCode, xtraParams, waveId,cartonNo, conn);
......@@ -636,7 +678,11 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
ConsolidatToDoc conToDoc = new ConsolidatToDoc();
//errString = conToDoc.process(ptcn, conn,xtraParams);
errString = conToDoc.process(tempPTCN, conn,xtraParams);
//errString = conToDoc.process(tempPTCN, conn,xtraParams);
// Changed by Manish on 08/06/16 [start]
errString = conToDoc.process(tempPTCN, null,xtraParams);
// Changed by Manish on 08/06/16 [end]
if ( errString != null && errString.trim().length() > 0 )
{
isError = true;
......@@ -763,7 +809,7 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
String error = "";
String errCode = "";
String siteCode = "", chgUser = "", chgTerm = "", sql = "", despId = "";
String stockSql = "";
String stockSql = "", isDeallocAllow = "";
double quantity = 0.0;
double shipperSize = 0;
double totalGrossWeight = 0,totalTareWeight = 0,totalNetWeight = 0;
......@@ -785,8 +831,10 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
//ConnDriver connDriver = new ConnDriver();
InvAllocTraceBean invallocTraceBean = new InvAllocTraceBean();
try
{
isDeallocAllow = checkNull(disCommon.getDisparams("999999","IS_DEALLOC_ALL",conn));
siteCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "site_code");
chgUser = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "loginCode");
chgTerm = genericUtility.getValueFromXTRA_PARAMS(xtraParams, "termId");
......@@ -903,7 +951,8 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
invallocTraceMap.put("ref_line",lineNo);
//changed by sankara on 06/05/14 for manual stock allocation start.
//errString = invallocTraceBean.updateInvallocTrace(invallocTraceMap,conn);
if( !"M".trim().equalsIgnoreCase(allocMode) )
//if( !"M".trim().equalsIgnoreCase(allocMode) )
if( !"M".trim().equalsIgnoreCase(allocMode) || "Y".equalsIgnoreCase(isDeallocAllow))
{
errString = invallocTraceBean.updateInvallocTrace(invallocTraceMap,conn);
}
......@@ -914,9 +963,10 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
System.out.println("errString :::"+ errString );
return errString;
}
//Changed By Manish
//changed by sankara on 06/05/14 added if condition for checking manual stock allocation case start
if( !"M".trim().equalsIgnoreCase(allocMode) )
//if( !"M".trim().equalsIgnoreCase(allocMode) )
if( !"M".trim().equalsIgnoreCase(allocMode) || "Y".equalsIgnoreCase(isDeallocAllow))
{
updateSorditem ="UPDATE SORDITEM SET QTY_ALLOC = QTY_ALLOC - " + new Double(DeallocQty).toString()
+" WHERE SALE_ORDER = '" + saleOrder + "' "
......@@ -3007,7 +3057,6 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
pstmt.setString(2, pickOrder);
pstmt.setInt(3, pickLineNo);
update = pstmt.executeUpdate();
conn.commit(); //Added by manish on 29/09/15
if( update > 0 )
{
......@@ -3332,7 +3381,6 @@ public class DeallocArtConf extends ActionHandlerEJB implements DeallocArtConfLo
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, refId);
update = pstmt.executeUpdate();
conn.commit(); //Added by manish on 29/09/15
if(update > 0)
{
......
webitm-wms/ibase/webitm/ejb/wms/DeallocArtPrc.java
View file @ af3b44db
......@@ -737,7 +737,6 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
pstmt.setString(6, chgTerm );
if( pstmt.executeUpdate() > 0)
{
conn.commit(); //Added by manish on 29/09/15
System.out.println(" insertion in DEALLOC_ART successfully ");
}
pstmt.close();pstmt = null;
......@@ -1048,8 +1047,7 @@ public class DeallocArtPrc extends ProcessEJB implements WaveGenerationPrcLocal,
pstmt.setString(14, lotSl);
pstmt.setString(15, pickType);
if( pstmt.executeUpdate() > 0 )
{
conn.commit();
{
System.out.println(" insert in DEALLOC_ART_DET succesfully done ");
}
else
......
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