Skip to content

B
business-java
Commit f3c14c90 authored by kshinde's avatar kshinde
Browse files
Options

Bug fix Indent IC standard quantity not set properly 

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@183904 ce508802-f39f-4f6c-b175-0d175dae99d5
parent 4590719d
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 52 deletions
webitm-dis/ibase/webitm/ejb/dis/IndentReqConf.java
View file @ f3c14c90
......@@ -196,13 +196,16 @@ public class IndentReqConf extends ActionHandlerEJB implements IndentReqConfLoca
if(cnt > 0)
{
errCode = "VTNOITEM";
/*errCode = "VTNOITEM";
errList.add( errCode );
errFields.add(childNodeName.toLowerCase());
errFields.add(childNodeName.toLowerCase());*/
errString = itmDBAccess.getErrorString("","VTNOITEM","","",conn);
return errString;
}
cnt = 0;
sql = "SELECT IND_NO, LINE_NO, ITEM_CODE, QUANTITY, REQ_DATE FROM INDENT_DET WHERE IND_NO = ? ";
//Changed by kunal on 19/04/2018 for removing INDENTITEM part
/*sql = "SELECT IND_NO, LINE_NO, ITEM_CODE, QUANTITY, REQ_DATE FROM INDENT_DET WHERE IND_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, indno);
rs = pstmt.executeQuery();
......@@ -238,63 +241,70 @@ public class IndentReqConf extends ActionHandlerEJB implements IndentReqConfLoca
{
rs.close();
rs = null;
}
}*/
}
cnt = 1;
/*cnt = 1;
sql = "SELECT ITEM_CODE, LINE_NO, QUANTITY, REQ_DATE FROM INDENTITEM_DET WHERE IND_NO = ? ";
pstmt = conn.prepareStatement(sql);
pstmt.setString(1, indno);
rs = pstmt.executeQuery();
*/
sql1 = "SELECT LINE_NO,ITEM_CODE,REQ_DATE,UNIT,SPECIFIC_INSTR,PRIORITY,APR_CODE,SPECIAL_INSTR,ACCT_CODE, CCTR_CODE,EMP_CODE__IAPR,SUPP_CODE__PREF," +
"PURC_RATE,PACK_CODE, PUR_LEAD_TIME,PACK_INSTR,SUPP_CODE__MNFR,QUANTITY__STDUOM, UNIT__STD,CONV__QTY_STDUOM," +
"EMP_CODE__PUR,REMARKS, QUANTITY_ATSITE, AVECONSQTY_ATSITE, REORDERQTY_ATSITE, QUANTITY,EMP_CODE__QCAPRV, " +
"MAX_RATE,ITEM_CODE__MFG,WORK_ORDER,ANAL_CODE FROM INDENT_DET WHERE IND_NO = ?";
pstmt = conn.prepareStatement(sql1);
pstmt.setString(1, indno);
rs = pstmt.executeQuery();
while(rs.next())
{
itemcode = checkNullAndTrim(rs.getString("ITEM_CODE"));
lineno = rs.getInt("LINE_NO");
qty = rs.getInt("QUANTITY");
reqdate = rs.getDate("REQ_DATE");
sql1 = "SELECT UNIT,SPECIFIC_INSTR,PRIORITY,APR_CODE,SPECIAL_INSTR,ACCT_CODE, CCTR_CODE,EMP_CODE__IAPR,SUPP_CODE__PREF," +
/*sql1 = "SELECT LINE_NO,ITEM_CODE,REQ_DATE,UNIT,SPECIFIC_INSTR,PRIORITY,APR_CODE,SPECIAL_INSTR,ACCT_CODE, CCTR_CODE,EMP_CODE__IAPR,SUPP_CODE__PREF," +
"PURC_RATE,PACK_CODE, PUR_LEAD_TIME,PACK_INSTR,SUPP_CODE__MNFR,QUANTITY__STDUOM, UNIT__STD,CONV__QTY_STDUOM," +
"EMP_CODE__PUR,REMARKS, QUANTITY_ATSITE, AVECONSQTY_ATSITE, REORDERQTY_ATSITE, QUANTITY,EMP_CODE__QCAPRV, " +
"MAX_RATE,ITEM_CODE__MFG,WORK_ORDER,ANAL_CODE FROM INDENT_DET WHERE IND_NO = ? AND ITEM_CODE = ? AND LINE_NO = ? ";
"MAX_RATE,ITEM_CODE__MFG,WORK_ORDER,ANAL_CODE FROM INDENT_DET WHERE IND_NO = ? AND LINE_NO= ? AND ITEM_CODE= ?";
pstmt1 = conn.prepareStatement(sql1);
pstmt1.setString(1, indno);
pstmt1.setString(2, itemcode);
pstmt1.setInt(3, lineno);
pstmt1.setString(1, lineno);
pstmt1.setString(1, itemcode);
rs1 = pstmt1.executeQuery();
if(rs1.next())
{
unit = checkNullAndTrim(rs1.getString("UNIT"));
speinst = checkNullAndTrim(rs1.getString("SPECIFIC_INSTR"));
priority = checkNullAndTrim(rs1.getString("PRIORITY"));
apr = checkNullAndTrim(rs1.getString("APR_CODE"));
splinst = checkNullAndTrim(rs1.getString("SPECIAL_INSTR"));
acct = checkNullAndTrim(rs1.getString("ACCT_CODE"));
cctr = checkNullAndTrim(rs1.getString("CCTR_CODE"));
ls_emp = checkNullAndTrim(rs1.getString("EMP_CODE__IAPR"));
ls_supp = checkNullAndTrim(rs1.getString("SUPP_CODE__PREF"));
ld_purcrate = checkNullAndTrim(rs1.getString("PURC_RATE"));
ls_pack = checkNullAndTrim(rs1.getString("PACK_CODE"));
lc_pur_lead = checkNullAndTrim(rs1.getString("PUR_LEAD_TIME"));
ls_pack_instr = checkNullAndTrim(rs1.getString("PACK_INSTR"));
ls_supp_mnfr = checkNullAndTrim(rs1.getString("SUPP_CODE__MNFR"));
lc_qty_std = checkNullAndTrim(rs1.getString("QUANTITY__STDUOM"));
ls_unit_std = checkNullAndTrim(rs1.getString("UNIT__STD"));
lc_conv = checkNullAndTrim(rs1.getString("CONV__QTY_STDUOM"));
ls_emp_pur = checkNullAndTrim(rs1.getString("EMP_CODE__PUR"));
ls_remarks = checkNullAndTrim(rs1.getString("REMARKS"));
ld_quantity_atsite = checkNullAndTrim(rs1.getString("QUANTITY_ATSITE"));
ld_aveconsqty_atsite = checkNullAndTrim(rs1.getString("AVECONSQTY_ATSITE"));
ld_reorderqty_atsite = checkNullAndTrim(rs1.getString("REORDERQTY_ATSITE"));
lc_quantity = rs1.getInt("QUANTITY");
ls_emp_code__qcaprv= checkNullAndTrim(rs1.getString("EMP_CODE__QCAPRV"));
ld_max_rate = checkNullAndTrim(rs1.getString("MAX_RATE"));
ls_item_cd_mfg = checkNullAndTrim(rs1.getString("ITEM_CODE__MFG"));
LS_WORK_ORDER = checkNullAndTrim(rs1.getString("WORK_ORDER"));
ls_anal_code = checkNullAndTrim(rs1.getString("ANAL_CODE"));
{*/
lineno = rs.getInt("LINE_NO");
itemcode = checkNullAndTrim(rs.getString("ITEM_CODE"));
reqdate = rs.getDate("REQ_DATE");
unit = checkNullAndTrim(rs.getString("UNIT"));
speinst = checkNullAndTrim(rs.getString("SPECIFIC_INSTR"));
priority = checkNullAndTrim(rs.getString("PRIORITY"));
apr = checkNullAndTrim(rs.getString("APR_CODE"));
splinst = checkNullAndTrim(rs.getString("SPECIAL_INSTR"));
acct = checkNullAndTrim(rs.getString("ACCT_CODE"));
cctr = checkNullAndTrim(rs.getString("CCTR_CODE"));
ls_emp = checkNullAndTrim(rs.getString("EMP_CODE__IAPR"));
ls_supp = checkNullAndTrim(rs.getString("SUPP_CODE__PREF"));
ld_purcrate = checkNullAndTrim(rs.getString("PURC_RATE"));
ls_pack = checkNullAndTrim(rs.getString("PACK_CODE"));
lc_pur_lead = checkNullAndTrim(rs.getString("PUR_LEAD_TIME"));
ls_pack_instr = checkNullAndTrim(rs.getString("PACK_INSTR"));
ls_supp_mnfr = checkNullAndTrim(rs.getString("SUPP_CODE__MNFR"));
lc_qty_std = checkNullAndTrim(rs.getString("QUANTITY__STDUOM"));
ls_unit_std = checkNullAndTrim(rs.getString("UNIT__STD"));
lc_conv = checkNullAndTrim(rs.getString("CONV__QTY_STDUOM"));
ls_emp_pur = checkNullAndTrim(rs.getString("EMP_CODE__PUR"));
ls_remarks = checkNullAndTrim(rs.getString("REMARKS"));
ld_quantity_atsite = checkNullAndTrim(rs.getString("QUANTITY_ATSITE"));
ld_aveconsqty_atsite = checkNullAndTrim(rs.getString("AVECONSQTY_ATSITE"));
ld_reorderqty_atsite = checkNullAndTrim(rs.getString("REORDERQTY_ATSITE"));
lc_quantity = rs.getInt("QUANTITY");
ls_emp_code__qcaprv= checkNullAndTrim(rs.getString("EMP_CODE__QCAPRV"));
ld_max_rate = checkNullAndTrim(rs.getString("MAX_RATE"));
ls_item_cd_mfg = checkNullAndTrim(rs.getString("ITEM_CODE__MFG"));
LS_WORK_ORDER = checkNullAndTrim(rs.getString("WORK_ORDER"));
ls_anal_code = checkNullAndTrim(rs.getString("ANAL_CODE"));
}
if(pstmt1 != null)
/*}*/
/*if(pstmt1 != null)
{
pstmt1.close();
pstmt1 = null;
......@@ -303,10 +313,10 @@ public class IndentReqConf extends ActionHandlerEJB implements IndentReqConfLoca
{
rs1.close();
rs1 = null;
}
lc_qty_std = (lc_qty_std.length() == 0) ? "0" : lc_qty_std;
lc_qty_stduom = (qty/lc_quantity) * Double.parseDouble(lc_qty_std);
}*/
//Taking qty_stduom from INDENT_DET
// lc_qty_std = (lc_qty_std.length() == 0) ? "0" : lc_qty_std;
// lc_qty_stduom = (qty/lc_quantity) * Double.parseDouble(lc_qty_std);
sql1 = "SELECT DESCR FROM ITEM WHERE ITEM_CODE = ? ";
pstmt1 = conn.prepareStatement(sql1);
......@@ -371,7 +381,7 @@ public class IndentReqConf extends ActionHandlerEJB implements IndentReqConfLoca
pstmtInsert.setDate(5, reqdate);
pstmtInsert.setString(6, itemcode);
pstmtInsert.setString(7, itemdescr);
pstmtInsert.setInt(8, qty);
pstmtInsert.setInt(8, lc_quantity);
pstmtInsert.setString(9, unit);
pstmtInsert.setString(10, emp);
pstmtInsert.setString(11, site);
......@@ -395,7 +405,8 @@ public class IndentReqConf extends ActionHandlerEJB implements IndentReqConfLoca
pstmtInsert.setString(29, ls_pack_instr);
pstmtInsert.setString(30, ls_supp_mnfr);
pstmtInsert.setString(31, ls_sitebill);
pstmtInsert.setDouble(32, lc_qty_stduom);
//pstmtInsert.setDouble(32, lc_qty_stduom);
pstmtInsert.setDouble(32, (lc_qty_std.length()>0?Double.parseDouble(lc_qty_std):0));
pstmtInsert.setString(33, ls_unit_std);
pstmtInsert.setString(34, lc_conv);
pstmtInsert.setString(35, ls_emp_pur);
......
webitm-dis/ibase/webitm/ejb/dis/IndentReqIC.java
View file @ f3c14c90
......@@ -4407,7 +4407,7 @@ public class IndentReqIC extends ValidatorEJB implements IndentICLocal, IndentIC
{
valueXmlString.append( "<conv__qty_stduom><![CDATA[" ).append(lc_conv1).append( "]]></conv__qty_stduom>\r\n" );
}
valueXmlString.append( "<quantity__stduom><![CDATA[" ).append(qty.get(0).toString()).append( "]]></quantity__stduom>\r\n" );
valueXmlString.append( "<quantity__stduom><![CDATA[" ).append(qty.get(1).toString()).append( "]]></quantity__stduom>\r\n" );
sql = "SELECT PURC_RATE FROM ITEM WHERE ITEM_CODE = ? ";
......
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