Skip to content

B
business-java
Commit 0db13972 authored by mnair's avatar mnair
Browse files
Options

Added changes to the sordNo variable 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177162 ce508802-f39f-4f6c-b175-0d175dae99d5
parent b5edc843
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 18 deletions
webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java
View file @ 0db13972
......@@ -173,7 +173,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
String confirm = "", ledgPostConf = "";
String errString = "",holdFlag = "",holdFlagNew = "",invStat = "",grade = "",tranSer = "",gpSer = "",gpNo = "",siteCodeExc = "";
String statusDesp = "",channelPartner = "",lockLevel = "",isAllocated = "",varValue = "",disLink = "";
String availableYN = "",tranid = "",siteCode = "",disparmVal = "",sordNo = "",lineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo = "",lotSl = "",locCode = "",unitStd = "";
String availableYN = "",tranid = "",siteCode = "",disparmVal = "",sordNoDet="",sordNo = "",lineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo = "",lotSl = "",locCode = "",unitStd = "";
double quantityStduom = 0.0,quantity = 0.0,rateStduom = 0.0,hldQty = 0.0,qtyAlloc = 0.0,OrderQty = 0.0,mQtyCheck = 0.0;
double mCancperc = 0.0,bondTaxAmt = 0.0,bondValue = 0.0,bankGuarantee = 0.0;
double grossWeight = 0.0,tareWeight = 0.0,netweight = 0.0;
......@@ -403,7 +403,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
if( varValue.contains(siteCodeExc))
{
gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNo,conn);//Code need to be migrated
}
......@@ -454,6 +455,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt3 = conn.prepareStatement(sql3);
pstmt3.setString(1,tranId);
rs3 = pstmt3.executeQuery();
//MAYUR KALIDAS NAIR -----START--[25-12-17]
while ( rs3.next() )
{
if(statusDesp != "X")
......@@ -710,7 +712,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
+" and loc_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
pstmt.setString(2,lineNo);
pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd);
......@@ -745,7 +748,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
+" and lot_no = ? and lot_sl = ? and loc_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
pstmt.setString(2,lineNo);
pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd);
......@@ -770,7 +774,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
+" and lot_no = ? and lot_sl = ? and loc_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
pstmt.setString(2,lineNo);
pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd);
......@@ -793,7 +798,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql);
//pstmt.setDouble(1,qtyAlloc - quantityStduom);
pstmt.setDouble(1,quantityStduom);
pstmt.setString(2,sordNo);
//pstmt.setString(2,sordNo);
pstmt.setString(2,sordNoDet);
pstmt.setString(3,lineNo);
pstmt.setString(4,expLev);
pstmt.setString(5,itemCodeOrd);
......@@ -823,7 +829,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setDouble(1, quantityStduom);
pstmt.setDouble(2,quantity);
pstmt.setTimestamp(3,despDate);
pstmt.setString(4,sordNo);
//pstmt.setString(4,sordNo);
pstmt.setString(4,sordNoDet);
//changes lineNo to lineNoSord By Pavan Rane on 30/05/17 START
pstmt.setString(5, lineNoSord);
......@@ -869,8 +876,9 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
sql = " select order_type, item_ser, pending_order from sorder "
+" where sale_order = ?";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -912,7 +920,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
updDesp.put("tran_id", tranId);
updDesp.put("tran_type", "ID");
updDesp.put("line_no", lineNo);
updDesp.put("sorder_no",sordNo);
//updDesp.put("sorder_no",sordNo);
updDesp.put("sorder_no",sordNoDet);
updDesp.put("item_code", itemCode);
updDesp.put("site_code", siteCode);
updDesp.put("loc_code", locCode);
......@@ -1106,7 +1115,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
sql = "select sum(quantity) as lc_order_qty , sum(quantity) - sum(qty_desp) as mqty_chk from sorditem "
+ "where sale_order = ? and line_type = 'I'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -1138,7 +1148,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt.setString(2,status);
pstmt.setTimestamp(3,despDate);
pstmt.setString(4,allocFlag);
pstmt.setString(5,sordNo);
//pstmt.setString(5,sordNo);
pstmt.setString(5,sordNoDet);
pstmt.executeUpdate();
......@@ -1188,7 +1199,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
{
sql = " update sorditem set status = 'C' where sale_order = ? and line_no = ? and exp_lev= ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
pstmt.setString(2,lineNoSord);
pstmt.setString(3,expLev);
pstmt.executeUpdate();
......@@ -1200,7 +1212,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
sql = "update sorddet set status = 'C' where sale_order = ? and line_no = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
pstmt.setString(2,lineNoSord);
pstmt.executeUpdate();
......@@ -1215,7 +1228,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
sql = "select count(1) as ll_cnt from sorddet where sale_order = ? and status <> 'C'";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,sordNo);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -1232,7 +1246,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,despDate);
pstmt.setString(2,sordNo);
//pstmt.setString(2,sordNo);
pstmt.setString(2,sordNoDet);
pstmt.executeUpdate();
......@@ -1252,8 +1267,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,despDate);
pstmt.setString(2,sordNo);
//pstmt.setString(2,sordNo);
pstmt.setString(2,sordNoDet);
pstmt.executeUpdate();
pstmt.close();
......@@ -1350,6 +1365,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
}
}//status not cancelled
}
//MA YUR KALIDAS NAIR -----END--[25-12-17]
pstmt3.close();
pstmt3 = null;
rs3.close();
......
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