Skip to content

B
business-java
Commit 295b910d authored by mjadhav's avatar mjadhav
Browse files
Options

update pack_instr,pallet wt ,diamension from porcpdet to depspatch 


git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@96609 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 04c5519e
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 19 deletions
webitm-dis/ibase/webitm/ejb/dis/GenerateSaleOrderPrc.java
View file @ 295b910d
......@@ -104,7 +104,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
} //end of confirm method
public String process(Document dom, Document dom2, String windowName,String xtraParams) throws RemoteException, ITMException
{
System.out.println("process called..13-10-2014....5:14 !!!!..");
System.out.println("process called..16-10-2014....5:14 !!!!..");
String sql = "";
String errString = "";
String siteCode = "";
......@@ -580,8 +580,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
String packCode ="",convRtuomStduom="",rateStduom="",dlvTo="";
String lineno = "",noArt = "",netAmt = "",frtTerm="",deliveryTerm="",commpercon="",commPercOn2="";
String pin = "", stateCode = "",city = "",countCode = "",unitStd = "",salesPersTmp="",crTermTmp="",salesPersTmp1="",salesPersTmp2="";
String transmodeFromCust="",custCodeBil="",pricelist="",pricelistClg="",salespers="",salespers1="",salespers2="";
String add1="",add2="",add3="",tele1="",tele2="",tele3="",invoiceNo="",packInstr="";
String transmodeFromCust="",custCodeBil="",pricelist="",pricelistClg="",salespers="",salespers1="",salespers2="",dlvTO="";
String add1="",add2="",add3="",tele1="",tele2="",tele3="",invoiceNo="",packInstr="",palletNo="",dlvDescr="";
Date orderDt = null;
Date orderDateInput=null;
Date lrDate=null;
......@@ -1007,7 +1007,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
custCodeDlv=deliverToDom==""?custCode:deliverToDom;
/*-------------------added by manoj on dated 13-oct-14----------------------------------------------------------------------*/
sql = "select dlv_term, TRAN_CODE, addr1,addr2,addr3,tele1,tele2,tele3,trans_mode,stan_code,city,count_code,pin,state_code,CURR_CODE__FRT,CURR_CODE__INS from customer where cust_code = ? ";
sql = "select dlv_term, TRAN_CODE, addr1,addr2,addr3,tele1,tele2,tele3,trans_mode,stan_code,city,count_code,pin,state_code,CURR_CODE__FRT,CURR_CODE__INS ,cust_name from customer where cust_code = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,custCodeDlv);
rs = pstmt.executeQuery();
......@@ -1040,6 +1040,10 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
countCode = rs.getString("count_code")== null ?" ":rs.getString("count_code");
pin = rs.getString("pin")== null ?" ":rs.getString("pin");
stateCode = rs.getString("state_code")== null ?" ":rs.getString("state_code");
System.out.println("");
//dlvTO = rs.getString("cust_name") == null ?" ":rs.getString("cust_name");
dlvDescr = rs.getString("cust_name");
System.out.println("@@@@@@ dlvTo :"+dlvTO);
if(transMode == null || transMode.trim().length()==0)
{
transMode = rs.getString("trans_mode")== null ?" ":rs.getString("trans_mode");
......@@ -1071,6 +1075,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
System.out.println("deliveryTerm :"+deliveryTerm);
System.out.println("transMode :"+transMode);
System.out.println("tranCode :"+tranCode);
System.out.println("dlvDescr :"+dlvDescr);
......@@ -1111,6 +1116,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("<site_code><![CDATA["+ siteCode.trim() +"]]></site_code>");
xmlBuff.append("<site_code__ship><![CDATA["+ siteCode.trim() +"]]></site_code__ship>");
xmlBuff.append("<cust_code><![CDATA["+ groupCode.trim() +"]]></cust_code>");
xmlBuff.append("<dlv_to><![CDATA["+ dlvDescr +"]]></dlv_to>");
xmlBuff.append("<cust_code__bil><![CDATA["+ custCodeBil.trim() +"]]></cust_code__bil>");
xmlBuff.append("<cust_code__dlv><![CDATA["+ custCodeDlv.trim() +"]]></cust_code__dlv>");
xmlBuff.append("<stan_code><![CDATA["+ stanCode.trim() +"]]></stan_code>");
......@@ -1216,7 +1222,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("</Detail1>");
sql = "select line_no,item_code,quantity,rate,unit,conv__qty_stduom,unit__rate,tax_class,tax_chap,tax_env,pack_code,rate__clg,quantity__stduom,unit__std," +
"no_art,conv__rtuom_stduom,rate__stduom,NET_AMT,discount,PACK_INSTR from porcpdet where tran_id = ? order by line_no";
"no_art,conv__rtuom_stduom,rate__stduom,NET_AMT,discount,PACK_INSTR,PALLET_NO from porcpdet where tran_id = ? order by line_no";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,tranId);
rs = pstmt.executeQuery();
......@@ -1242,6 +1248,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rateStduom = rs.getString("rate__stduom");
convRtuomStduom = rs.getString("conv__rtuom_stduom");
quntyStduom = rs.getString("quantity__stduom") == null ? "0" : rs.getString("quantity__stduom");
palletNo = rs.getString("PALLET_NO") == null ? " " : rs.getString("PALLET_NO");
sql = " select min_shelf_life ,max_shelf_life "
+" from sordertype where order_type = ? ";
......@@ -1458,6 +1465,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("<comm_perc_on_2><![CDATA["+ commPercOn1 +"]]></comm_perc_on_2>");
xmlBuff.append("<comm_perc_3><![CDATA["+ commPerc2 +"]]></comm_perc_3>");
xmlBuff.append("<comm_perc_on_3><![CDATA["+ commPercOn2 +"]]></comm_perc_on_3>");
//xmlBuff.append("<no_pallet><![CDATA["+ palletNo +"]]></no_pallet>");
xmlBuff.append("</Detail2>");
}
lnno = 0;
......@@ -1483,12 +1491,38 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
int endIndex = arrayForTranId[1].indexOf("</TranID>");
String tranIdForIssue = arrayForTranId[1].substring(0,endIndex);
System.out.println("-tranIdForIssue-"+tranIdForIssue);
sql = " update sorder set purc_order = ? where sale_order = ? ";
System.out.println("dlvDescr :"+dlvDescr);
sql = " update sorder set purc_order = ? ,DLV_TO = ?where sale_order = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,purcOrder);
pstmt.setString(2,tranIdForIssue);
int rows = pstmt.executeUpdate();System.out.println("updated rows =="+rows);
pstmt.setString(2,dlvDescr);
pstmt.setString(3,tranIdForIssue);
int rows = pstmt.executeUpdate();
System.out.println("updated rows =="+rows);
conn.commit();
/*------------------------changes by mahendra 16-10-14------------------------------*/
System.out.println("update query after before confirm sale order");
System.out.println("tranIdForIssue :"+tranIdForIssue);
System.out.println("packInstr :"+packInstr);
System.out.println("packCode :"+packCode);
System.out.println("palletNo :"+palletNo);
System.out.println("dlvDescr :"+dlvDescr);
sql = " update sorddet set PACK_INSTR = ?,PACK_CODE = ? where sale_order = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,packInstr);
pstmt.setString(2,packCode);
// pstmt.setString(3,palletNo);
pstmt.setString(3,tranIdForIssue);
int row = pstmt.executeUpdate();
System.out.println("updated rows@@@ =="+row);
conn.commit();
/*------------------------------------------------------------------------------------*/
// perameter added on 17/apr/2014 by RITESH
String varValue1 = dComm.getDisparams("999999","AUTO_CONF_SORD", conn);
if("NULLFOUND".equalsIgnoreCase(varValue1))
......@@ -1573,7 +1607,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
String taxClass="";
String taxChap="";
String taxEnv = "";
String packCode ="";
String packCode ="",dlvTo="";
String siteCodeDet ="",convRtuomStduom="";
String locCode = "",rateStduom="",netAmt="";
String varValue = "",unitStd = "",noArt = "",packInstr="";
......@@ -1614,7 +1648,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
sql = "select item_ser,site_code,curr_code,exch_rate,tran_code, trans_mode,curr_code__frt,curr_code__ins,cust_code__dlv," +
" stan_code,order_date,EXCH_RATE__FRT,EXCH_RATE__INS,FOB_VALUE,CONF_DATE,CHG_DATE,STATE_CODE__DLV,UDF__STR1,UDF__STR2,DLV_ADD1,DLV_ADD2,DLV_ADD3," +
" DLV_CITY,DLV_PIN,COUNT_CODE__DLV,TRAN_CODE,STAN_CODE,STAN_CODE__INIT,PARENT__TRAN_ID,REV__TRAN,STATUS_REMARKS,SPEC_REASON,DIST_ROUTE,STATUS,STATUS_DATE"+
" DLV_TO,DLV_CITY,DLV_PIN,COUNT_CODE__DLV,TRAN_CODE,STAN_CODE,STAN_CODE__INIT,PARENT__TRAN_ID,REV__TRAN,STATUS_REMARKS,SPEC_REASON,DIST_ROUTE,STATUS,STATUS_DATE"+
" from sorder where sale_order = ? " ;
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
......@@ -1635,7 +1669,9 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
dlvAdd1 = rs.getString("DLV_ADD1") == null ? " " : rs.getString("DLV_ADD1");
dlvAdd2 = rs.getString("DLV_ADD2") == null ? " " : rs.getString("DLV_ADD2");
dlvAdd3 = rs.getString("DLV_ADD3") == null ? " " : rs.getString("DLV_ADD3");
dlvTo = rs.getString("DLV_TO") == null ? " " : rs.getString("DLV_TO");
/*------------------------------------------------------------------------------*/
dlvCity = rs.getString("DLV_CITY") == null ? " " : rs.getString("DLV_CITY");
dlvPin = rs.getString("DLV_PIN") == null ? " " : rs.getString("DLV_PIN");
countCodeDlv = rs.getString("COUNT_CODE__DLV") == null ? " " : rs.getString("COUNT_CODE__DLV");
......@@ -1736,8 +1772,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("<state_code__dlv><![CDATA["+ stanCodeDlv.trim()+"]]></state_code__dlv>");
/*--------------------changed by mahendra on dated 13-oct-14-----------------------------*/
xmlBuff.append("<dlv_add1><![CDATA["+ dlvAdd1 +"]]></dlv_add1>");
xmlBuff.append("<dlv_add2><![CDATA["+ dlvAdd2 +"]]></dlv_add2>");
xmlBuff.append("<dlv_add2><![CDATA["+ dlvAdd3 +"]]></dlv_add2>");
xmlBuff.append("<dlv_add3><![CDATA["+ dlvAdd2 +"]]></dlv_add3>");
/*----------------------------------------------------------------------------*/
xmlBuff.append("<dlv_city><![CDATA["+ dlvCity +"]]></dlv_city>");
xmlBuff.append("<dlv_pin><![CDATA["+ dlvPin +"]]></dlv_pin>");
......@@ -1749,7 +1785,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
xmlBuff.append("</Detail1>");
sql = "select line_no,item_code,quantity,rate,unit,conv__qty_stduom,unit__rate,tax_class,tax_chap,tax_env,pack_code,rate__clg,quantity__stduom," +
"net_tot_amt,net_amt,site_code,unit__std,no_art,rate__stduom,conv__rtuom_stduom,PACK_INSTR from sorddet where sale_order = ? order by line_no";
"net_tot_amt,net_amt,site_code,unit__std,no_art,rate__stduom,conv__rtuom_stduom,PACK_INSTR,NO_PALLET from sorddet where sale_order = ? order by line_no";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1,saleOrder);
rs = pstmt.executeQuery();
......@@ -1757,7 +1793,7 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
{
lnNoSord = rs.getString("line_no");
itemCode = rs.getString("item_code") == null ? " " : rs.getString("item_code");
quantity = rs.getString("quantity") == null ? "0" : rs.getString("quantity") ;
quantity = rs.getString("quantity") == null ? "0" : rs.getString("quantity");
rate = rs.getString("rate")== null ? " " : rs.getString("rate");
unit = rs.getString("unit") == null ? " " : rs.getString("unit");
conQtyStd = rs.getString("conv__qty_stduom") == null ? " " : rs.getString("conv__qty_stduom");
......@@ -1776,8 +1812,11 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
rateStduom = rs.getString("rate__stduom");
convRtuomStduom = rs.getString("conv__rtuom_stduom");
netAmt = rs.getString("net_amt");
//palletWt = rs.getInt("NO_PALLET");
//palletWt = rs.getString("NO_PALLET") == null ? " " : rs.getString("NO_PALLET");
sql =" SELECT LOT_SL,LOT_NO,LOC_CODE,GROSS_WEIGHT,TARE_WEIGHT,NET_WEIGHT FROM PORCPDET WHERE TRAN_ID = ? AND LINE_NO = ? ";
sql =" SELECT LOT_SL,LOT_NO,LOC_CODE,GROSS_WEIGHT,TARE_WEIGHT,NET_WEIGHT,DIMENSION,PALLET_WT FROM PORCPDET WHERE TRAN_ID = ? AND LINE_NO = ? ";
pstmt1 = conn.prepareStatement(sql);
pstmt1.setString(1,tranId);
pstmt1.setString(2,lnNoSord);
......@@ -1787,16 +1826,18 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
lotSl = rs1.getString("LOT_SL")==null ? " ":rs1.getString("LOT_SL");
lotNo = rs1.getString("LOT_NO")==null ? " ":rs1.getString("LOT_NO");
locCode = rs1.getString("LOC_CODE")==null ? " ":rs1.getString("LOC_CODE");
dimension = rs1.getString("DIMENSION")==null ? " ":rs1.getString("DIMENSION");
grossWeightFmPorcp = rs1.getDouble("GROSS_WEIGHT");
tareWeightFmPorcp = rs1.getDouble("TARE_WEIGHT");
netWeightFmPorcp = rs1.getDouble("NET_WEIGHT");
palletWt = rs1.getInt("PALLET_WT");
}
rs1.close();
rs1 =null;
pstmt1.close();
pstmt1 = null;
System.out.println("pallet wt from receipt :"+palletWt);
// ADDED BY RITESH ON 26/05/13 START
sqlTemp ="SELECT A.EXP_DATE, "
+"A.QUANTITY, "
......@@ -1828,8 +1869,9 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
grossWeight = rs1.getDouble("GROSS_WEIGHT");
tareWeight = rs1.getDouble("TARE_WEIGHT");
netWeight = rs1.getDouble("NET_WEIGHT");
dimension = rs1.getString("DIMENSION");
palletWt = rs1.getDouble("PALLET_WT");
//if(dimension == null)
//dimension = rs1.getString("DIMENSION");
//palletWt = rs1.getDouble("PALLET_WT");
cAllocQty = rs1.getDouble("alloc_qty");
expDate = rs1.getDate("EXP_DATE");
siteCodeMfg = rs1.getString("SITE_CODE__MFG");
......@@ -1974,6 +2016,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
{
System.out.println("@@@@@@3: retString from despatch"+retString);
conn.commit();
varValue = dComm.getDisparams("999999","AUTO_CONF_DESP", conn);
System.out.println("varValue --"+varValue);
if("Y".equalsIgnoreCase(varValue.trim()))
......@@ -1981,7 +2025,8 @@ public class GenerateSaleOrderPrc extends ProcessEJB implements GenerateSaleOrde
String[] arrayForTranId = retString.split("<TranID>");
int endIndex = arrayForTranId[1].indexOf("</TranID>");
String tranIdForDesp = arrayForTranId[1].substring(0,endIndex);
System.out.println("-tranIdForDesp-"+tranIdForDesp);
System.out.println("-tranIdForDesp-"+tranIdForDesp);
retString = confirmSaleOrder("despatch",tranIdForDesp,xtraParams,conn);
System.out.println("retString from conf from despatch ::"+retString);
......
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