Skip to content

B
business-java
Commit 046f4353 authored by ajadhav's avatar ajadhav
Browse files
Options

tag by Ajay Jadhav 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@177158 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 9e93629d
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 53 deletions
webitm-dis/ibase/webitm/ejb/dis/DespatchConfirm.java
View file @ 046f4353
......@@ -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 = "",sordNoDet = "",lineNo = "",lineNoSord = "",expLev = "",itemCodeOrd = "",itemCode = "",lotNo = "",lotSl = "",locCode = "",unitStd = "";
String availableYN = "",tranid = "",siteCode = "",disparmVal = "",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;
......@@ -213,16 +213,20 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "select confirmed, lr_date from despatch where desp_id = ? for update ";
//sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status , lr_date from despatch where desp_id = ? for update ";
}
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = "select confirmed, lr_date from despatch (updlock) where desp_id = ? " ;
//sql = "SELECT confirmed, (CASE WHEN status IS NULL THEN 'P' ELSE status END) as status, lr_date from despatch (updlock) where desp_id = ? " ;
}
else
{
sql = "select confirmed, lr_date from despatch where desp_id = ? for update nowait" ;
sql = "select confirmed, lr_date from despatch where desp_id = ? for update nowait" ;
//sql = "select confirmed, (CASE WHEN status IS NULL THEN 'P' ELSE status END) as status,lr_date from despatch where desp_id = ? for update nowait" ;
}
pstmt = conn.prepareStatement(sql);
......@@ -325,8 +329,12 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
{
varValue = "Y";
}
sql = "select status,desp_date,available_yn,desp_id,site_code,sord_no,cust_code__dlv,cust_code,gp_date,gp_ser,gp_no "
+ " from despatch where desp_id = ? ";// QUERY OF SRD TO BE COPIED...........
//Changes and Commented By Ajay on 25-12-2017:START
// sql = "select status,desp_date,available_yn,desp_id,site_code,sord_no,cust_code__dlv,cust_code,gp_date,gp_ser,gp_no "
// + " from despatch where desp_id = ? ";// QUERY OF SRD TO BE COPIED...........
sql ="select (CASE WHEN status IS NULL THEN 'P' ELSE status END) as status ,desp_date,available_yn,desp_id,site_code,sord_no,cust_code__dlv,cust_code,gp_date,gp_ser,gp_no "
+ " from despatch where desp_id = ?";
//Changes and Commented By Ajay on 25-12-2017:END
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, tranId);
rs = pstmt.executeQuery();
......@@ -338,9 +346,8 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
despDate = rs.getTimestamp("desp_date");
availableYN = checkNull(rs.getString("available_yn"));
tranid = checkNull(rs.getString("desp_id"));
siteCode = checkNull(rs.getString("site_code"));
//sordNo = checkNull(rs.getString("sord_no"));
sordNoDet = checkNull(rs.getString("sord_no"));
siteCode = checkNull(rs.getString("site_code"));
sordNo = checkNull(rs.getString("sord_no"));
custCode = checkNull(rs.getString("cust_code"));
custCodeDlv = checkNull(rs.getString("cust_code__dlv"));
gpDate = rs.getTimestamp("gp_date");
......@@ -396,13 +403,13 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
if( varValue.contains(siteCodeExc))
{
//gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNo,conn);
gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNoDet,conn);//Code need to be migrated
gpNo = generateGPNO(xmlValues,siteCodeExc+gpSer,sordNo,conn);//Code need to be migrated
}
else{
//gpNo = generateGPNO(xmlValues,siteCodeExc,sordNo,conn);
gpNo = generateGPNO(xmlValues,siteCodeExc,sordNoDet,conn);//Code need to be migrated
gpNo = generateGPNO(xmlValues,siteCodeExc,sordNo,conn);//Code need to be migrated
}
......@@ -447,8 +454,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt3 = conn.prepareStatement(sql3);
pstmt3.setString(1,tranId);
rs3 = pstmt3.executeQuery();
//mayur kalidas nair -25-12-17-------start
while ( rs3.next() )
{
if(statusDesp != "X")
......@@ -705,8 +710,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
+" and loc_code = ? ";
pstmt = conn.prepareStatement(sql);
//pstmt.setString(1,sordNo);
pstmt.setString(1,sordNoDet);
pstmt.setString(1,sordNo);
pstmt.setString(2,lineNo);
pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd);
......@@ -741,8 +745,7 @@ 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,sordNoDet);
pstmt.setString(1,sordNo);
pstmt.setString(2,lineNo);
pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd);
......@@ -767,8 +770,7 @@ 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,sordNoDet);
pstmt.setString(1,sordNo);
pstmt.setString(2,lineNo);
pstmt.setString(3,expLev);
pstmt.setString(4,itemCodeOrd);
......@@ -791,8 +793,7 @@ 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,sordNoDet);
pstmt.setString(2,sordNo);
pstmt.setString(3,lineNo);
pstmt.setString(4,expLev);
pstmt.setString(5,itemCodeOrd);
......@@ -822,9 +823,7 @@ 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,sordNoDet);
pstmt.setString(4,sordNo);
//changes lineNo to lineNoSord By Pavan Rane on 30/05/17 START
pstmt.setString(5, lineNoSord);
......@@ -870,8 +869,7 @@ 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,sordNoDet);
pstmt.setString(1,sordNo);
rs = pstmt.executeQuery();
if(rs.next())
......@@ -914,8 +912,7 @@ 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",sordNoDet);
updDesp.put("sorder_no",sordNo);
updDesp.put("item_code", itemCode);
updDesp.put("site_code", siteCode);
updDesp.put("loc_code", locCode);
......@@ -1109,8 +1106,7 @@ 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,sordNoDet);
pstmt.setString(1,sordNo);
rs = pstmt.executeQuery();
if(rs.next())
{
......@@ -1142,8 +1138,7 @@ 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,sordNoDet);
pstmt.setString(5,sordNo);
pstmt.executeUpdate();
......@@ -1193,8 +1188,7 @@ 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,sordNoDet);
pstmt.setString(1,sordNo);
pstmt.setString(2,lineNoSord);
pstmt.setString(3,expLev);
pstmt.executeUpdate();
......@@ -1206,8 +1200,7 @@ 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,sordNoDet);
pstmt.setString(1,sordNo);
pstmt.setString(2,lineNoSord);
pstmt.executeUpdate();
......@@ -1222,8 +1215,7 @@ 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,sordNoDet);
pstmt.setString(1,sordNo);
rs = pstmt.executeQuery();
while(rs.next())
{
......@@ -1240,8 +1232,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,despDate);
//pstmt.setString(2,sordNo);
pstmt.setString(2,sordNoDet);
pstmt.setString(2,sordNo);
pstmt.executeUpdate();
......@@ -1261,8 +1252,7 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
pstmt = conn.prepareStatement(sql);
pstmt.setTimestamp(1,despDate);
//pstmt.setString(2,sordNo);
pstmt.setString(2,sordNoDet);
pstmt.setString(2,sordNo);
pstmt.executeUpdate();
......@@ -1360,7 +1350,6 @@ public class DespatchConfirm extends ActionHandlerEJB implements DespatchConfirm
}
}//status not cancelled
}
//mayur kalidas nair -25-12-17-------end
pstmt3.close();
pstmt3 = null;
rs3.close();
......
webitm-dis/ibase/webitm/ejb/dis/adv/PorderConf.java
View file @ 046f4353
......@@ -1705,7 +1705,9 @@ public class PorderConf extends ActionHandlerEJB implements PorderConfLocal, Por
masterStateful = (MasterStatefulLocal)ctx.lookup("ibase/MasterStatefulEJB/local");
System.out.println("-----------masterStateful------- " + masterStateful);
String [] authencate = new String[2];
authencate[0] = "";
//Changes By Ajay on 25-12-2017:START
authencate[0] = "userId";
//Changes By Ajay on 25-12-2017:END
authencate[1] = "";
System.out.println("xmlString to masterstateful [" + xmlString + "]");
retString = masterStateful.processRequest(authencate, siteCode, true, xmlString,true,conn);
......
webitm-dis/ibase/webitm/ejb/dis/adv/SaleOrderHold.java
View file @ 046f4353
......@@ -71,16 +71,20 @@ public class SaleOrderHold extends ActionHandlerEJB implements SaleOrderHoldLoca
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ) || "mysql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update ";
//Changes and Commented By Ajay on 22-12-2017:START
//sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update ";
sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder WHERE sale_order = ? for update ";
}
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = " SELECT confirmed, status FROM sorder (updlock) WHERE sale_order = ? ";
//sql = " SELECT confirmed, status FROM sorder (updlock) WHERE sale_order = ? ";
sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder (updlock) WHERE sale_order = ?";
}
else
{
sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update nowait ";
//sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update nowait ";
sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder WHERE sale_order = ? for update nowait";
//Changes and Commented By Ajay on 22-12-2017:END
}
pstmt = conn.prepareStatement(sql);
......
webitm-dis/ibase/webitm/ejb/dis/adv/SaleOrderRelease.java
View file @ 046f4353
......@@ -75,16 +75,21 @@ public class SaleOrderRelease extends ActionHandlerEJB implements SaleOrderRelea
if ("db2".equalsIgnoreCase(CommonConstants.DB_NAME ) || "mysql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update ";
//Changes and Commented By Ajay on 22-12-2017:START
//sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update ";
sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder WHERE sale_order = ? for update ";
}
else if ( "mssql".equalsIgnoreCase(CommonConstants.DB_NAME ))
{
sql = " SELECT confirmed, status FROM sorder (updlock) WHERE sale_order = ? ";
//sql = " SELECT confirmed, status FROM sorder (updlock) WHERE sale_order = ? ";
sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder (updlock) WHERE sale_order = ? ";
}
else
{
sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update nowait ";
//sql = " SELECT confirmed, status FROM sorder WHERE sale_order = ? for update nowait ";
sql = "SELECT confirmed,(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status FROM sorder WHERE sale_order = ? for update nowait";
//Changes and Commented By Ajay on 22-12-2017:END
}
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
......
webitm-dis/ibase/webitm/ejb/dis/adv/SorderConf.java
View file @ 046f4353
......@@ -66,8 +66,12 @@ public class SorderConf extends ActionHandlerEJB implements SorderConfLocal, Sor
if (saleOrder != null && saleOrder.trim().length() > 0)
{
sql = " select cust_code , item_ser , site_code , due_date , tot_amt, confirmed , " +
" status, order_date from sorder where sale_order = ? ";
//Changes and Commented By Ajay on 22-12-2017:START
//sql = " select cust_code , item_ser , site_code , due_date , tot_amt, confirmed , " +
// " status, order_date from sorder where sale_order = ? ";
sql = "select cust_code , item_ser , site_code , due_date , tot_amt, confirmed , " +
"(CASE WHEN status IS NULL THEN 'P' ELSE status END) as status , order_date from sorder where sale_order = ?";
//Changes and Commented By Ajay on 22-12-2017:END
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, saleOrder);
rs = pstmt.executeQuery();
......
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